git-fetch-script: use git-fetch-pack for local and ssh fetches.
Also, clean it up a lot.
This commit is contained in:
parent
723c31fea2
commit
0a623e7ce8
@ -11,37 +11,22 @@ fi
|
|||||||
|
|
||||||
: ${GIT_DIR=.git}
|
: ${GIT_DIR=.git}
|
||||||
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
|
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
|
||||||
|
TMP_HEAD="$GIT_DIR/TMP_HEAD"
|
||||||
|
|
||||||
download_one () {
|
case "$merge_repo" in
|
||||||
# remote_path="$1" local_file="$2"
|
http://*)
|
||||||
case "$1" in
|
head=$(wget -q -O - "$merge_repo/$merge_name") || exit 1
|
||||||
http://*)
|
git-http-pull -a "$head" "$merge_repo"
|
||||||
wget -q -O "$2" "$1" ;;
|
;;
|
||||||
/*)
|
rsync://*)
|
||||||
test -f "$1" && cat >"$2" "$1" ;;
|
rsync -L "$merge_repo/$merge_name" "$TMP_HEAD" || exit 1
|
||||||
*)
|
head=$(git-rev-parse TMP_HEAD)
|
||||||
rsync -L "$1" "$2" ;;
|
rm -f "$TMP_HEAD"
|
||||||
esac
|
rsync -avz --ignore-existing "$merge_repo/objects/" "$GIT_OBJECT_DIRECTORY/"
|
||||||
}
|
;;
|
||||||
|
*)
|
||||||
download_objects () {
|
head=$(git-fetch-pack "$merge_repo" "$merge_name")
|
||||||
# remote_repo="$1" head_sha1="$2"
|
;;
|
||||||
case "$1" in
|
esac || exit 1
|
||||||
http://*)
|
git-rev-parse --verify "$head" > /dev/null || exit 1
|
||||||
git-http-pull -a "$2" "$1/"
|
echo "$head" > "$GIT_DIR/$destination"
|
||||||
;;
|
|
||||||
/*)
|
|
||||||
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
|
|
||||||
|
Loading…
Reference in New Issue
Block a user