diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-25 12:57:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-25 12:57:48 -0700 |
| commit | 7756b1f1dc07fae9abab4126a687a2609dfbf009 (patch) | |
| tree | 03b62a5fb81bc0e974f2d37829505c683cdf20a6 /git-fetch.sh | |
| parent | 1259404c7e5cd88b7f6692986469cd20cbfacdad (diff) | |
| parent | 70da769a4607dbbc4efc490287ead98175cf622b (diff) | |
| download | git-7756b1f1dc07fae9abab4126a687a2609dfbf009.tar.gz git-7756b1f1dc07fae9abab4126a687a2609dfbf009.tar.xz | |
Merge branch 'maint'
* maint:
xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
Update cherry documentation.
Refer to git-rev-parse:Specifying Revisions from git.txt
git-fetch.sh printed protocol fix
RPM package re-classification.
Documentation: note about contrib/.
git-svn: fix symlink-to-file changes when using command-line svn 1.4.0
Set $HOME for selftests
Diffstat (limited to 'git-fetch.sh')
| -rwxr-xr-x | git-fetch.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-fetch.sh b/git-fetch.sh index b15fc2b38..7dc1f3368 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -296,6 +296,7 @@ fetch_main () { # There are transports that can fetch only one head at a time... case "$remote" in http://* | https://* | ftp://*) + proto=`expr "$remote" : '\([^:]*\):'` if [ -n "$GIT_SSL_NO_VERIFY" ]; then curl_extra_args="-k" fi @@ -319,7 +320,7 @@ fetch_main () { done expr "z$head" : "z$_x40\$" >/dev/null || die "Failed to fetch $remote_name from $remote" - echo >&2 Fetching "$remote_name from $remote" using http + echo >&2 "Fetching $remote_name from $remote using $proto" git-http-fetch -v -a "$head" "$remote/" || exit ;; rsync://*) |