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 ab3b6f92bbc83b2a8c32c30bce6f98bbe6b90b75..b44cf3f5a5bf61788ae6dc384ed59841ddd1f517 100755 (executable)
--- 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