From 2796a9de31cb12d719c73695334ee873c5213d4a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 26 Jan 2006 18:11:06 -0800 Subject: [PATCH] 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 --- Documentation/fetch-options.txt | 3 +-- git-fetch.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 83237562d..13f34d3ca 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 :: --u :: +\--upload-pack :: When given, and the repository to fetch from is handled by 'git-fetch-pack', '--exec=' is passed to the command to specify non-default path for the command diff --git a/git-fetch.sh b/git-fetch.sh index 6730346ba..b4325d9d9 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" -- 2.26.2