diff options
| -rw-r--r-- | Documentation/fetch-options.txt | 7 | ||||
| -rwxr-xr-x | git-fetch.sh | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index e624d3d0ee..83237562d2 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -3,6 +3,13 @@ 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>:: + 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 + run on the other end. + -f, \--force:: When `git-fetch` is used with `<rbranch>:<lbranch>` refspec, it refuses to update the local branch diff --git a/git-fetch.sh b/git-fetch.sh index 4a0cb32f30..d1659e2cfe 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -17,12 +17,18 @@ append= force= verbose= update_head_ok= +exec= while case "$#" in 0) break ;; esac do case "$1" in -a|--a|--ap|--app|--appe|--appen|--append) append=t ;; + -u|--u|--up|--upl|--uploa|--upload|--upload-|--upload-p|--upload-pa|\ + --upload-pac|--upload-pack) + shift + exec="--exec=$1" + ;; -f|--f|--fo|--for|--forc|--force) force=t ;; @@ -312,7 +318,7 @@ fetch_main () { ( : subshell because we muck with IFS IFS=" $LF" ( - git-fetch-pack $keep "$remote" $rref || echo failed "$remote" + git-fetch-pack $exec $keep "$remote" $rref || echo failed "$remote" ) | while read sha1 remote_name do |