Skip to content

Commit

Permalink
git-fetch --upload-pack: disambiguate.
Browse files Browse the repository at this point in the history
Johannes noticed the recent addition of this new flag
inadvertently took over existing --update-head-ok (-u).  Require
longer abbreviation to this new option which would be needed in
a rare setup.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Jan 27, 2006
1 parent 521698b commit 2796a9d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions Documentation/fetch-options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
existing contents of `.git/FETCH_HEAD`. Without this
option old data in `.git/FETCH_HEAD` will be overwritten.

--upload-pack <upload-pack>::
-u <upload-pack>::
\--upload-pack <upload-pack>::
When given, and the repository to fetch from is handled
by 'git-fetch-pack', '--exec=<upload-pack>' is passed to
the command to specify non-default path for the command
Expand Down
4 changes: 2 additions & 2 deletions git-fetch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ do
-a|--a|--ap|--app|--appe|--appen|--append)
append=t
;;
-u|--u|--up|--upl|--uploa|--upload|--upload-|--upload-p|--upload-pa|\
--upload-pac|--upload-pack)
--upl|--uplo|--uploa|--upload|--upload-|--upload-p|\
--upload-pa|--upload-pac|--upload-pack)
shift
exec="--exec=$1"
upload_pack="-u $1"
Expand Down

0 comments on commit 2796a9d

Please sign in to comment.