summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-27 02:11:06 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-27 02:11:06 (GMT)
commit2796a9de31cb12d719c73695334ee873c5213d4a (patch)
tree4630739fa26fbdd027a19661765e11dec187cabd
parent521698b1538fb3c9bd818ee98f2c17d2c80c9605 (diff)
downloadgit-2796a9de31cb12d719c73695334ee873c5213d4a.zip
git-2796a9de31cb12d719c73695334ee873c5213d4a.tar.gz
git-2796a9de31cb12d719c73695334ee873c5213d4a.tar.bz2
git-fetch --upload-pack: disambiguate.
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>
-rw-r--r--Documentation/fetch-options.txt3
-rwxr-xr-xgit-fetch.sh4
2 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 8323756..13f34d3 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -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
diff --git a/git-fetch.sh b/git-fetch.sh
index 6730346..b4325d9 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -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"