diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 11:07:24 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 11:07:24 -0500 |
| commit | 76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a (patch) | |
| tree | 80a6b54d21978b5c3879662bdc4f5951f804b808 /git-ls-remote.sh | |
| parent | Accept 'inline' file data in fast-import commit structure. (diff) | |
| parent | blameview: Use git-cat-file to read the file content. (diff) | |
| download | tgif-76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a.tar.xz | |
Merge branch 'master' into sp/gfi
git-fast-import requires use of inttypes.h, but the master branch has
added it to git-compat-util differently than git-fast-import originally
had used it. This merge back of master to the fast-import topic is to
get (and use) inttypes.h the way master is using it.
This is a partially evil merge to remove the call to setup_ident(),
as the master branch now contains a change which makes this implicit
and therefore removed the function declaration. (commit 01754769).
Conflicts:
git-compat-util.h
Diffstat (limited to 'git-ls-remote.sh')
| -rwxr-xr-x | git-ls-remote.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-ls-remote.sh b/git-ls-remote.sh index 03b624ef33..e6f574b99b 100755 --- a/git-ls-remote.sh +++ b/git-ls-remote.sh @@ -23,7 +23,11 @@ do -u|--u|--up|--upl|--uploa|--upload|--upload-|--upload-p|--upload-pa|\ --upload-pac|--upload-pack) shift - exec="--exec=$1" + exec="--upload-pack=$1" + shift;; + -u=*|--u=*|--up=*|--upl=*|--uplo=*|--uploa=*|--upload=*|\ + --upload-=*|--upload-p=*|--upload-pa=*|--upload-pac=*|--upload-pack=*) + exec=--upload-pack=$(expr "$1" : '-[^=]*=\(.*\)') shift;; --) shift; break ;; @@ -54,7 +58,7 @@ http://* | https://* | ftp://* ) curl_extra_args="-k" fi if [ -n "$GIT_CURL_FTP_NO_EPSV" -o \ - "`git-repo-config --bool http.noEPSV`" = true ]; then + "`git-config --bool http.noEPSV`" = true ]; then curl_extra_args="${curl_extra_args} --disable-epsv" fi curl -nsf $curl_extra_args --header "Pragma: no-cache" "$peek_repo/info/refs" || |