X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=ba0ca079e204a464ee05b6c000ed891ed3c08b33;hb=27c96c4fd38ffbde98df22699c755a043bb383d1;hp=ed04e7d8d8753cc2cdc7d2737228cb58934534f4;hpb=17250ac172b44acd3bdf4ddffb4ed6d915b69246;p=git.git diff --git a/git-pull.sh b/git-pull.sh index ed04e7d8d..ba0ca079e 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -6,7 +6,14 @@ USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [] ...' LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.' +SUBDIRECTORY_OK=Yes . git-sh-setup +set_reflog_action "pull $*" +require_work_tree +cd_to_toplevel + +test -z "$(git ls-files -u)" || + die "You are in the middle of a conflicted merge." strategy_args= no_summary= no_commit= squash= while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac @@ -15,6 +22,9 @@ do -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ --no-summa|--no-summar|--no-summary) no_summary=-n ;; + --summary) + no_summary=$1 + ;; --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) no_commit=--no-commit ;; --sq|--squ|--squa|--squas|--squash) @@ -44,10 +54,10 @@ do shift done -orig_head=$(git-rev-parse --verify HEAD) || die "Pulling into a black hole?" -git-fetch --update-head-ok --reflog-action=pull "$@" || exit 1 +orig_head=$(git-rev-parse --verify HEAD 2>/dev/null) +git-fetch --update-head-ok "$@" || exit 1 -curr_head=$(git-rev-parse --verify HEAD) +curr_head=$(git-rev-parse --verify HEAD 2>/dev/null) if test "$curr_head" != "$orig_head" then # The fetch involved updating the current branch. @@ -76,32 +86,38 @@ merge_head=$(sed -e '/ not-for-merge /d' \ case "$merge_head" in '') + curr_branch=$(git-symbolic-ref -q HEAD) + case $? in + 0) ;; + 1) echo >&2 "You are not currently on a branch; you must explicitly" + echo >&2 "specify which branch you wish to merge:" + echo >&2 " git pull " + exit 1;; + *) exit $?;; + esac + curr_branch=${curr_branch#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 ;; ?*' '?*) - var=`git-repo-config --get pull.octopus` - if test -n "$var" + if test -z "$orig_head" then - strategy_default_args="-s $var" - fi - ;; -*) - var=`git-repo-config --get pull.twohead` - if test -n "$var" - then - strategy_default_args="-s $var" + echo >&2 "Cannot merge multiple branches into empty head" + exit 1 fi ;; esac -case "$strategy_args" in -'') - strategy_args=$strategy_default_args - ;; -esac +if test -z "$orig_head" +then + git-update-ref -m "initial pull" HEAD $merge_head "" && + git-read-tree --reset -u HEAD || exit 1 + exit +fi 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