summaryrefslogtreecommitdiff
path: root/git-fetch-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-16 17:31:38 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-16 17:31:38 (GMT)
commit9c2b1c0cd89d8cc8a3882e85c6b6535f282bf59f (patch)
treedafa75baaadeb0ae39f91d72b332a2cd01cd2f7c /git-fetch-script
parent60ea0fdd7de001405fcc7591beb18a66a1f0dd09 (diff)
downloadgit-9c2b1c0cd89d8cc8a3882e85c6b6535f282bf59f.zip
git-9c2b1c0cd89d8cc8a3882e85c6b6535f282bf59f.tar.gz
git-9c2b1c0cd89d8cc8a3882e85c6b6535f282bf59f.tar.bz2
git-fetch-script: fix http:// breakage
We were trying to fetch using the merge-head name rather than the merge-head SHA1 that we just got. Now, http:// is broken anyway right now for packing, but this should make it work for nonpacked repositories again.
Diffstat (limited to 'git-fetch-script')
-rwxr-xr-xgit-fetch-script2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-fetch-script b/git-fetch-script
index ab3b6f9..b44cf3f 100755
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -12,7 +12,7 @@ case "$merge_repo" in
http://*)
head=$(wget -q -O - "$merge_repo/$merge_head") || exit 1
echo Fetching "$merge_head" using http
- git-http-pull -v -a "$merge_head" "$merge_repo/"
+ git-http-pull -v -a "$head" "$merge_repo/"
;;
rsync://*)
rsync -L "$merge_repo/$merge_head" "$TMP_HEAD" || exit 1