diff --git a/git-fetch-script b/git-fetch-script
index 7cd88b93b21c47018be7de84e7b1252d32c6098f..acb1e56e70a974d276eb915a51fc5351801b24a5 100755 (executable)
--- a/git-fetch-script
+++ b/git-fetch-script
#!/bin/sh
#
#!/bin/sh
#
+destination=FETCH_HEAD
+
merge_repo=$1
merge_name=${2:-HEAD}
merge_repo=$1
merge_name=${2:-HEAD}
+if [ "$2" = "tag" ]; then
+ merge_name="refs/tags/$3"
+ destination="$merge_name"
+fi
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
-
-download_one () {
- # remote_path="$1" local_file="$2"
- case "$1" in
- http://*)
- wget -q -O "$2" "$1" ;;
- /*)
- test -f "$1" && cat >"$2" "$1" ;;
- *)
- rsync -L "$1" "$2" ;;
- esac
-}
-
-download_objects () {
- # remote_repo="$1" head_sha1="$2"
- case "$1" in
- http://*)
- git-http-pull -a "$2" "$1/"
- ;;
- /*)
- git-local-pull -l -a "$2" "$1/"
- ;;
- *)
- rsync -avz --ignore-existing \
- "$1/objects/." "$GIT_OBJECT_DIRECTORY"/.
- ;;
- esac
-}
+. git-sh-setup-script || die "Not a git archive"
-echo "Getting remote $merge_name"
-download_one "$merge_repo/$merge_name" "$GIT_DIR"/MERGE_HEAD || exit 1
+TMP_HEAD="$GIT_DIR/TMP_HEAD"
-echo "Getting object database"
-download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)" || exit 1
+case "$merge_repo" in
+http://*)
+ head=$(wget -q -O - "$merge_repo/$merge_name") || exit 1
+ echo Fetching $head using http
+ git-http-pull -v -a "$head" "$merge_repo/"
+ ;;
+rsync://*)
+ rsync -L "$merge_repo/$merge_name" "$TMP_HEAD" || exit 1
+ head=$(git-rev-parse TMP_HEAD)
+ rm -f "$TMP_HEAD"
+ rsync -avz --ignore-existing "$merge_repo/objects/" "$GIT_OBJECT_DIRECTORY/"
+ ;;
+*)
+ head=$(git-fetch-pack "$merge_repo" "$merge_name")
+ ;;
+esac || exit 1
+git-rev-parse --verify "$head" > /dev/null || exit 1
+echo "$head" > "$GIT_DIR/$destination"