X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=75ec011969f7cd84979911b917b886696a077c5e;hb=7ae4dd05725e1613375e03f206077959853d6b51;hp=d4765188b4ad9d41a0ffec333d9b449de03968a6;hpb=619e5a0ed4a53653085961b7aefe1f93ed879949;p=git.git diff --git a/git-pull.sh b/git-pull.sh index d4765188b..75ec01196 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -4,25 +4,45 @@ # # Fetch one or more remote refs and merge it/them into the current HEAD. -. git-sh-setup || die "Not a git archive" +USAGE='[-n | --no-summary] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-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 -usage () { - die "git pull [-n] [-s strategy]... ..." -} +test -z "$(git ls-files -u)" || + die "You are in the middle of a conflicted merge." -strategy_args= no_summary= -while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac +strategy_args= no_summary= no_commit= squash= no_ff= +while : do case "$1" in -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 ;; + --c|--co|--com|--comm|--commi|--commit) + no_commit=--commit ;; + --sq|--squ|--squa|--squas|--squash) + squash=--squash ;; + --no-sq|--no-squ|--no-squa|--no-squas|--no-squash) + squash=--no-squash ;; + --ff) + no_ff=--ff ;; + --no-ff) + no_ff=--no-ff ;; -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 ;; *) @@ -31,18 +51,21 @@ do esac strategy_args="${strategy_args}-s $strategy " ;; - -*) - # Pass thru anything that is meant for fetch. + -h|--h|--he|--hel|--help) + usage + ;; + *) + # Pass thru anything that may be meant for fetch. break ;; esac 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. @@ -52,9 +75,17 @@ then # First update the working tree to match $curr_head. echo >&2 "Warning: fetch updated the current branch head." - echo >&2 "Warning: fast forwarding your working tree." - git-read-tree -u -m "$orig_head" "$curr_head" || - die "You need to first update your working tree." + echo >&2 "Warning: fast forwarding your working tree from" + 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. +After making sure that you saved anything precious from +$ git diff '$orig_head' +output, run +$ git reset --hard +to recover.' + fi merge_head=$(sed -e '/ not-for-merge /d' \ @@ -63,22 +94,52 @@ merge_head=$(sed -e '/ not-for-merge /d' \ case "$merge_head" in '') - echo >&2 "No changes." - exit 0 + 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 "You asked me to pull without telling me which branch you" + echo >&2 "want to merge with, and 'branch.${curr_branch}.merge' in" + echo >&2 "your configuration file does not tell me either. Please" + echo >&2 "name which branch you want to merge on the command line and" + echo >&2 "try again (e.g. 'git pull ')." + echo >&2 "See git-pull(1) for details on the refspec." + echo >&2 + echo >&2 "If you often merge with the same branch, you may want to" + echo >&2 "configure the following variables in your configuration" + echo >&2 "file:" + echo >&2 + echo >&2 " branch.${curr_branch}.remote = " + echo >&2 " branch.${curr_branch}.merge = " + echo >&2 " remote..url = " + echo >&2 " remote..fetch = " + echo >&2 + echo >&2 "See git-config(1) for details." + exit 1 ;; ?*' '?*) - strategy_default_args='-s octopus' - ;; -*) - strategy_default_args='-s resolve' + if test -z "$orig_head" + then + 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 $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 $no_ff $strategy_args \ + "$merge_name" HEAD $merge_head