From 0a623e7ce8aedd938e8fd5611ccf7ae28c1eb7d9 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 5 Jul 2005 11:38:37 -0700 Subject: [PATCH] git-fetch-script: use git-fetch-pack for local and ssh fetches. Also, clean it up a lot. --- git-fetch-script | 79 +++++++++++++++++++++++--------------------------------- 1 file changed, 32 insertions(+), 47 deletions(-) rewrite git-fetch-script (72%) diff --git a/git-fetch-script b/git-fetch-script dissimilarity index 72% index fb4a53776a..244fc50d5e 100755 --- a/git-fetch-script +++ b/git-fetch-script @@ -1,47 +1,32 @@ -#!/bin/sh -# -destination=FETCH_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 -} - -echo "Getting remote $merge_name" -download_one "$merge_repo/$merge_name" "$GIT_DIR/$destination" || exit 1 - -echo "Getting object database" -download_objects "$merge_repo" "$(cat "$GIT_DIR/$destination")" || exit 1 +#!/bin/sh +# +destination=FETCH_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"}"} +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" + ;; +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" -- 2.11.4.GIT