From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 16 Jul 2005 17:31:38 +0000 (-0700)
Subject: git-fetch-script: fix http:// breakage
X-Git-Tag: v0.99.2~49
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9c2b1c0cd89d8cc8a3882e85c6b6535f282bf59f;p=git.git

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.
---

diff --git a/git-fetch-script b/git-fetch-script
index ab3b6f92b..b44cf3f5a 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