Skip to content

Commit

Permalink
Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"
Browse files Browse the repository at this point in the history
Instead of showing a warning and working as before, fail and show
the message and force immediate upgrade from their upstream
repositories when these tools are run, per request from their
primary author.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed May 20, 2014
1 parent 00a5b79 commit b2c851a
Show file tree
Hide file tree
Showing 11 changed files with 87 additions and 4,360 deletions.
7 changes: 7 additions & 0 deletions Documentation/RelNotes/2.0.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ UI, Workflows & Features
* The "multi-mail" post-receive hook (in contrib/) has been updated
to a more recent version from the upstream.

* The "remote-hg/bzr" remote-helper interfaces (in contrib/) are
now maintained separately as a third-party plug-in.

* "git gc --aggressive" learned "--depth" option and
"gc.aggressiveDepth" configuration variable to allow use of a less
insane depth than the built-in default value of 250.
Expand Down Expand Up @@ -88,6 +91,10 @@ UI, Workflows & Features
* "git grep" learned to behave in a way similar to native grep when
"-h" (no header) and "-c" (count) options are given.

* "git push" via transport-helper interface has been updated to
allow forced ref updates in a way similar to the natively
supported transports.

* The "simple" mode is the default for "git push".

* "git add -u" and "git add -A", when run without any pathspec, is a
Expand Down
14 changes: 0 additions & 14 deletions contrib/remote-helpers/Makefile

This file was deleted.

6 changes: 1 addition & 5 deletions contrib/remote-helpers/README
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The remote-helper bridges to access data stored in Mercurial and
Bazaar are maintained outside the git.git tree in the repositories
of its primary author:
of their primary author:

https://github.com/felipec/git-remote-hg (for Mercurial)
https://github.com/felipec/git-remote-bzr (for Bazaar)
Expand All @@ -13,7 +13,3 @@ repositories, e.g.:
$ wget -O $HOME/bin/git-remote-bzr \
https://raw.github.com/felipec/git-remote-bzr/master/git-remote-bzr
$ chmod +x $HOME/bin/git-remote-hg $HOME/bin/git-remote-bzr

As a convenience, copies of the last-bundled version of these two
remote-helper bridges are still kept here, but they may become
stale over time.
Loading

0 comments on commit b2c851a

Please sign in to comment.