diff options
author | Junio C Hamano <junkio@cox.net> | 2005-08-13 00:12:51 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-13 00:12:51 -0700 |
commit | 755d62788f0507781dbbf0ed1278b65ff4829185 (patch) | |
tree | be21e68b1c62bf14fc6a2d0f0f94dcb856f1ddad /git-fetch-script | |
parent | 8eb14dc1882ade6f881ae93dfd7ecaa0dc0f0fdc (diff) | |
parent | af36b70ef939cc44c447a4b9cbaadd7eba9a20b1 (diff) | |
download | git-755d62788f0507781dbbf0ed1278b65ff4829185.tar.gz |
Merge master changes into release candidate branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-fetch-script')
-rwxr-xr-x | git-fetch-script | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-fetch-script b/git-fetch-script index 24f0a5ec82..ea097144f7 100755 --- a/git-fetch-script +++ b/git-fetch-script @@ -31,6 +31,10 @@ rsync://*) ;; *) head=$(git-fetch-pack "$merge_repo" "$merge_head") + if h=`expr "$head" : '\([^ ][^ ]*\) '` + then + head=$h + fi ;; esac || exit 1 |