summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-05 19:02:10 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-05 19:02:10 (GMT)
commitf03f2ba0a558c6fbfcf40ca24da55a8e9d602e46 (patch)
treefd8b3752dce9fdbbc3b045e681dd417aeeca7000
parent0a623e7ce8aedd938e8fd5611ccf7ae28c1eb7d9 (diff)
downloadgit-f03f2ba0a558c6fbfcf40ca24da55a8e9d602e46.zip
git-f03f2ba0a558c6fbfcf40ca24da55a8e9d602e46.tar.gz
git-f03f2ba0a558c6fbfcf40ca24da55a8e9d602e46.tar.bz2
Work around git-http-pull breakage in git-fetch-script
Need to add a final slash. And make it verbose by default, since it's so slow that otherwise people will think it's died.
-rwxr-xr-xgit-fetch-script3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-fetch-script b/git-fetch-script
index 244fc50..8a2d37d 100755
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -16,7 +16,8 @@ TMP_HEAD="$GIT_DIR/TMP_HEAD"
case "$merge_repo" in
http://*)
head=$(wget -q -O - "$merge_repo/$merge_name") || exit 1
- git-http-pull -a "$head" "$merge_repo"
+ echo Fetching $head using http
+ git-http-pull -v -a "$head" "$merge_repo/"
;;
rsync://*)
rsync -L "$merge_repo/$merge_name" "$TMP_HEAD" || exit 1