dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-02 22:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] Retire git-parse-remote.

Browse Source 
Update git-pull to match updated git-fetch and allow pull to
fetch from multiple remote references.  There is no support for
resolving more than two heads, which will be done with "git
octopus".

Update "git ls-remote" to use git-parse-remote-script.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2005-08-20 02:57:26 -07:00
parent 853a3697dc
commit e0bfc81e05
4 changed files with 12 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
git-pull-script
View File

@@ -1,12 +1,16 @@
#!/bin/sh
#
. git-sh-setup-script || die "Not a git archive"
. git-parse-remote "$@"
merge_name="$_remote_name"
git-fetch-script "$@" || exit 1
merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
merge_name=$(sed -e 's/^[0-9a-f]* //' "$GIT_DIR"/FETCH_HEAD |
tr '\012' ' ')
case "$merge_head" in
'' | *' '?*) die "Cannot resolve multiple heads at the same time (yet)." ;;
esac
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
"$(cat "$GIT_DIR"/FETCH_HEAD)" \
"Merge $merge_name"
$merge_head "Merge $merge_name"