Skip to content

Commit b2c851a

Browse files
gitstergitster
committed
Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"
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>
1 parent 00a5b79 commit b2c851a

File tree

11 files changed

+87
-4360
lines changed

11 files changed

+87
-4360
lines changed

‎Documentation/RelNotes/2.0.0.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ UI, Workflows & Features
5555
* The "multi-mail" post-receive hook (in contrib/) has been updated
5656
to a more recent version from the upstream.
5757

58+
* The "remote-hg/bzr" remote-helper interfaces (in contrib/) are
59+
now maintained separately as a third-party plug-in.
60+
5861
* "git gc --aggressive" learned "--depth" option and
5962
"gc.aggressiveDepth" configuration variable to allow use of a less
6063
insane depth than the built-in default value of 250.
@@ -88,6 +91,10 @@ UI, Workflows & Features
8891
* "git grep" learned to behave in a way similar to native grep when
8992
"-h" (no header) and "-c" (count) options are given.
9093

94+
* "git push" via transport-helper interface has been updated to
95+
allow forced ref updates in a way similar to the natively
96+
supported transports.
97+
9198
* The "simple" mode is the default for "git push".
9299

93100
* "git add -u" and "git add -A", when run without any pathspec, is a

‎contrib/remote-helpers/Makefile‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎contrib/remote-helpers/README‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The remote-helper bridges to access data stored in Mercurial and
22
Bazaar are maintained outside the git.git tree in the repositories
3-
of its primary author:
3+
of their primary author:
44

55
https://github.com/felipec/git-remote-hg (for Mercurial)
66
https://github.com/felipec/git-remote-bzr (for Bazaar)
@@ -13,7 +13,3 @@ repositories, e.g.:
1313
$ wget -O $HOME/bin/git-remote-bzr \
1414
https://raw.github.com/felipec/git-remote-bzr/master/git-remote-bzr
1515
$ chmod +x $HOME/bin/git-remote-hg $HOME/bin/git-remote-bzr
16-
17-
As a convenience, copies of the last-bundled version of these two
18-
remote-helper bridges are still kept here, but they may become
19-
stale over time.

0 commit comments

Comments
 (0)