[PATCH] Add git-var a tool for reading interesting git variables.

[git.git] / git-fetch-script

diff --git a/git-fetch-script b/git-fetch-script
index 244fc50..acb1e56 100755 (executable)
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -9,14 +9,15 @@ if [ "$2" = "tag" ]; then
        destination="$merge_name"
 fi
 
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
+. git-sh-setup-script || die "Not a git archive"
+
 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