diff options
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/git-pull.sh b/git-pull.sh index e23beb685d..c184fb81a4 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -7,6 +7,10 @@ USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <repo> <head>...' LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.' . git-sh-setup +set_reflog_action "pull $*" + +test -z "$(git ls-files -u)" || + die "You are in a middle of conflicted merge." strategy_args= no_summary= no_commit= squash= while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac @@ -45,7 +49,7 @@ do done orig_head=$(git-rev-parse --verify HEAD 2>/dev/null) -git-fetch --update-head-ok --reflog-action=pull "$@" || exit 1 +git-fetch --update-head-ok "$@" || exit 1 curr_head=$(git-rev-parse --verify HEAD 2>/dev/null) if test "$curr_head" != "$orig_head" @@ -76,6 +80,10 @@ merge_head=$(sed -e '/ not-for-merge /d' \ case "$merge_head" in '') + curr_branch=$(git-symbolic-ref HEAD | \ + sed -e 's|^refs/heads/||') + echo >&2 "Warning: No merge candidate found because value of config option + \"branch.${curr_branch}.merge\" does not match any remote branch fetched." echo >&2 "No changes." exit 0 ;; @@ -85,18 +93,6 @@ case "$merge_head" in echo >&2 "Cannot merge multiple branches into empty head" exit 1 fi - var=`git-repo-config --get pull.octopus` - if test -n "$var" - then - strategy_default_args="-s $var" - fi - ;; -*) - var=`git-repo-config --get pull.twohead` - if test -n "$var" - then - strategy_default_args="-s $var" - fi ;; esac @@ -107,13 +103,6 @@ then exit fi -case "$strategy_args" in -'') - strategy_args=$strategy_default_args - ;; -esac - merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit -git-merge "--reflog-action=pull $*" \ - $no_summary $no_commit $squash $strategy_args \ +exec git-merge $no_summary $no_commit $squash $strategy_args \ "$merge_name" HEAD $merge_head |