diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-02 11:49:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-02 11:49:59 -0700 |
| commit | ff989b8d466ee2ec42c69c02e6551add430b8497 (patch) | |
| tree | 50c0ef99605ec0967156a3d2074dd27bdd4655d2 /git-fetch.sh | |
| parent | 367337040d8d39294bf676672dfefc542717195b (diff) | |
| parent | 7a21632fa346df58d94d32f09625025931ef13ec (diff) | |
| download | git-ff989b8d466ee2ec42c69c02e6551add430b8497.tar.gz | |
Merge branch 'master' into lj/refs
* master: (99 commits)
lock_ref_sha1_basic does not remove empty directories on BSD
git-push: .git/remotes/ file does not require SP after colon
git-mv: invalidate the removed path properly in cache-tree
Makefile: install and clean merge-recur, still.
GIT 1.4.3-rc1
gitweb: tree view: hash_base and hash are now context sensitive
git-diff -B output fix.
fetch: Reset remote refs list each time fetch_main is called
Remove -fPIC which was only needed for Git.xs
Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34
git-diff -B output fix.
Make cvsexportcommit remove files.
diff --stat: ensure at least one '-' for deletions, and one '+' for additions
diff --stat=width[,name-width]: allow custom diffstat output width.
gitweb: History: blob and tree are first, then commitdiff, etc
gitweb: Remove redundant "commit" from history
http/ftp: optionally ask curl to not use EPSV command
gitweb: Don't use quotemeta on internally generated strings
gitweb: Add snapshot to shortlog
gitweb: Factor out gitweb_have_snapshot()
...
Diffstat (limited to 'git-fetch.sh')
| -rwxr-xr-x | git-fetch.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-fetch.sh b/git-fetch.sh index 50ad101e89..f1522bd49a 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -257,6 +257,7 @@ fi fetch_main () { reflist="$1" refs= + rref= for ref in $reflist do @@ -289,6 +290,10 @@ fetch_main () { if [ -n "$GIT_SSL_NO_VERIFY" ]; then curl_extra_args="-k" fi + if [ -n "$GIT_CURL_FTP_NO_EPSV" -o \ + "`git-repo-config --bool http.noEPSV`" = true ]; then + noepsv_opt="--disable-epsv" + fi max_depth=5 depth=0 head="ref: $remote_name" @@ -300,7 +305,7 @@ fetch_main () { $u =~ s{([^-a-zA-Z0-9/.])}{sprintf"%%%02x",ord($1)}eg; print "$u"; ' "$head") - head=$(curl -nsfL $curl_extra_args "$remote/$remote_name_quoted") + head=$(curl -nsfL $curl_extra_args $noepsv_opt "$remote/$remote_name_quoted") depth=$( expr \( $depth + 1 \) ) done expr "z$head" : "z$_x40\$" >/dev/null || |