diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-06-07 16:15:32 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-06-07 16:15:32 -0700 |
commit | 81b4f18fb8f9356477157a3b9f0652d371cba835 (patch) | |
tree | 43c7f1ff37f8c9dabc1946325edeaedd1b9a6832 /Documentation | |
parent | 416fda6917f05b456ae263cb7152892bdf96f47c (diff) | |
parent | 709a957d9493cbdd457d02bfada067c9b3ccc253 (diff) | |
download | git-81b4f18fb8f9356477157a3b9f0652d371cba835.tar.gz |
Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile
* js/transport-helper-error-reporting-fix:
git-remote-testgit: build it to run under $SHELL_PATH
git-remote-testgit: further remove some bashisms
git-remote-testgit: avoid process substitution
t5801: "VAR=VAL shell_func args" is forbidden
transport-helper: update remote helper namespace
transport-helper: trivial code shuffle
transport-helper: warn when refspec is not used
transport-helper: clarify pushing without refspecs
transport-helper: update refspec documentation
transport-helper: clarify *:* refspec
transport-helper: improve push messages
transport-helper: mention helper name when it dies
transport-helper: report errors properly
Conflicts:
t/t5801-remote-helpers.sh
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/gitremote-helpers.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt index da746419b3..0827f69139 100644 --- a/Documentation/gitremote-helpers.txt +++ b/Documentation/gitremote-helpers.txt @@ -159,11 +159,11 @@ Miscellaneous capabilities carried out. 'refspec' <refspec>:: - This modifies the 'import' capability, allowing the produced - fast-import stream to modify refs in a private namespace - instead of writing to refs/heads or refs/remotes directly. + For remote helpers that implement 'import' or 'export', this capability + allows the refs to be constrained to a private namespace, instead of + writing to refs/heads or refs/remotes directly. It is recommended that all importers providing the 'import' - capability use this. + capability use this. It's mandatory for 'export'. + A helper advertising the capability `refspec refs/heads/*:refs/svn/origin/branches/*` @@ -174,8 +174,8 @@ ref. This capability can be advertised multiple times. The first applicable refspec takes precedence. The left-hand of refspecs advertised with this capability must cover all refs reported by -the list command. If a helper does not need a specific 'refspec' -capability then it should advertise `refspec *:*`. +the list command. If no 'refspec' capability is advertised, +there is an implied `refspec *:*`. 'bidi-import':: This modifies the 'import' capability. |