X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=c184fb81a4dab622d79120bcc986c3bf2b07df7f;hb=2eff14259ea4035dc5f8a18f5998e88dd4da207e;hp=4611ae644e08e4ab115633ab86f1f02976663169;hpb=0e84fb06a1022f99c96cfcd728e7bf029ef0b5e3;p=git.git diff --git a/git-pull.sh b/git-pull.sh index 4611ae644..c184fb81a 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -7,8 +7,12 @@ USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [] ...' LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.' . git-sh-setup +set_reflog_action "pull $*" -strategy_args= no_summary= no_commit= +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 do case "$1" in @@ -17,12 +21,14 @@ do no_summary=-n ;; --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) no_commit=--no-commit ;; + --sq|--squ|--squa|--squas|--squash) + squash=--squash ;; -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ --strateg=*|--strategy=*|\ -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) case "$#,$1" in *,*=*) - strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;; + strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;; 1,*) usage ;; *) @@ -42,10 +48,10 @@ do shift done -orig_head=$(git-rev-parse --verify HEAD) || die "Pulling into a black hole?" +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. @@ -56,7 +62,7 @@ then echo >&2 "Warning: fetch updated the current branch head." echo >&2 "Warning: fast forwarding your working tree from" - echo >&2 "Warning: $orig_head commit." + echo >&2 "Warning: commit $orig_head." git-update-index --refresh 2>/dev/null git-read-tree -u -m "$orig_head" "$curr_head" || die 'Cannot fast-forward your working tree. @@ -74,30 +80,29 @@ 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 ;; ?*' '?*) - 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") -git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head +merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit +exec git-merge $no_summary $no_commit $squash $strategy_args \ + "$merge_name" HEAD $merge_head