f170e4b39d
Since pull and fetch are done often against the same remote repository repeatedly, keeping the URL to pull from along with the name of the head to use in $GIT_DIR/branches/$name makes a lot of sense. Adopt that convention from Cogito, and try to be compatible when possible; storing a partial URL and completing it with a trailing path may not be understood by Cogito. While we are at it, fix pulling a tag. Earlier, we updated only refs/tags/$tag without updating FETCH_HEAD, and called resolve-script using a stale (or absent) FETCH_HEAD. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
40 lines
1001 B
Bash
Executable File
40 lines
1001 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 "$merge_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"
|