diff options
Diffstat (limited to 'git-pull-script')
| -rwxr-xr-x | git-pull-script | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/git-pull-script b/git-pull-script index fc463260bd..7016fbf943 100755 --- a/git-pull-script +++ b/git-pull-script @@ -1,12 +1,26 @@ #!/bin/sh # -. git-sh-setup-script || die "Not a git archive" -. git-parse-remote "$@" -merge_name="$_remote_name" +# Copyright (c) 2005 Junio C Hamano +# +# Fetch one or more remote refs and merge it/them into the current HEAD. +. git-sh-setup-script || die "Not a git archive" 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 +'') + echo >&2 "No changes." + exit 0 + ;; +*' '?*) + echo >&2 "Pulling more than one heads; making an Octopus." + exec git-octopus-script + ;; +esac git-resolve-script \ "$(cat "$GIT_DIR"/HEAD)" \ - "$(cat "$GIT_DIR"/FETCH_HEAD)" \ - "Merge $merge_name" + $merge_head "Merge $merge_name" |