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>

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 83237562d2ba2a8891f06646ab65c0b4817e225e..13f34d3ca28a402d56420f3bf5615837cf529e0a 100644 (file)
--- 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.
 
        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
         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 6730346ba07a8c60cb79a2ec720d072b74cebaca..b4325d9d98589bf7823174318b431197d6b896c6 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -25,8 +25,8 @@ do
        -a|--a|--ap|--app|--appe|--appen|--append)
                append=t
                ;;
        -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"
                shift
                exec="--exec=$1" 
                upload_pack="-u $1"