diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-08-20 02:57:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-24 16:50:50 -0700 |
| commit | e0bfc81e05e57679916ab070c8fb2525f24771d4 (patch) | |
| tree | 8c986688f21d71abcb232e5bd9c638cbee39bc3d /git-pull-script | |
| parent | [PATCH] Multi-head fetch. (diff) | |
| download | tgif-e0bfc81e05e57679916ab070c8fb2525f24771d4.tar.xz | |
[PATCH] Retire git-parse-remote.
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>
Diffstat (limited to 'git-pull-script')
| -rwxr-xr-x | git-pull-script | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/git-pull-script b/git-pull-script index fc463260bd..8608fcdebc 100755 --- a/git-pull-script +++ b/git-pull-script @@ -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" |