mirror of
https://github.com/git/git.git
synced 2024-11-06 17:23:00 +01:00
9c2b1c0cd8
We were trying to fetch using the merge-head name rather than the merge-head SHA1 that we just got. Now, http:// is broken anyway right now for packing, but this should make it work for nonpacked repositories again.
41 lines
1,002 B
Bash
Executable file
41 lines
1,002 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
. git-sh-setup-script || die "Not a git archive"
|
|
. git-parse-remote "$@"
|
|
merge_repo="$_remote_repo"
|
|
merge_head="$_remote_head"
|
|
merge_store="$_remote_store"
|
|
|
|
TMP_HEAD="$GIT_DIR/TMP_HEAD"
|
|
|
|
case "$merge_repo" in
|
|
http://*)
|
|
head=$(wget -q -O - "$merge_repo/$merge_head") || exit 1
|
|
echo Fetching "$merge_head" using http
|
|
git-http-pull -v -a "$head" "$merge_repo/"
|
|
;;
|
|
rsync://*)
|
|
rsync -L "$merge_repo/$merge_head" "$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_head")
|
|
;;
|
|
esac || exit 1
|
|
|
|
git-rev-parse --verify "$head" > /dev/null || exit 1
|
|
|
|
case "$merge_store" in
|
|
'')
|
|
;;
|
|
*)
|
|
echo "$head" > "$GIT_DIR/$merge_store"
|
|
esac &&
|
|
|
|
# FETCH_HEAD is fed to git-resolve-script which will eventually be
|
|
# passed to git-commit-tree as one of the parents. Make sure we do
|
|
# not give a tag object ID.
|
|
|
|
git-rev-parse "$head^0" >"$GIT_DIR/FETCH_HEAD"
|