X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=a3665d7751cc836dc669390df7b972c29575037b;hb=50cfde14531a5b354bbc3a070fe39c1ee86e2915;hp=e3d11961b0a5a7608648348153bde0ab6e7ccfff;hpb=348c4c66dacb1810a9bcd592e72f98a465233488;p=git.git diff --git a/git-pull.sh b/git-pull.sh index e3d11961b..a3665d775 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -4,12 +4,57 @@ # # 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] [-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 -orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?" +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 +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 ;; + --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 "z$1" : 'z-[^=]*=\(.*\)'` ;; + 1,*) + usage ;; + *) + strategy="$2" + shift ;; + esac + strategy_args="${strategy_args}-s $strategy " + ;; + -h|--h|--he|--hel|--help) + usage + ;; + -*) + # Pass thru anything that is meant for fetch. + break + ;; + esac + shift +done + +orig_head=$(git-rev-parse --verify HEAD 2>/dev/null) git-fetch --update-head-ok "$@" || exit 1 -curr_head=$(cat "$GIT_DIR/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. @@ -19,23 +64,57 @@ 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." + 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 "You need to first update your working tree." + 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 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ') +merge_head=$(sed -e '/ not-for-merge /d' \ + -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | \ + tr '\012' ' ') 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 ;; -*' '?*) - echo >&2 "Pulling more than one heads; making an Octopus." - exec git-octopus +?*' '?*) + if test -z "$orig_head" + then + echo >&2 "Cannot merge multiple branches into empty head" + exit 1 + fi ;; esac -merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") -git-resolve "$(cat "$GIT_DIR"/HEAD)" $merge_head "$merge_name" +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 +exec git-merge $no_summary $no_commit $squash $strategy_args \ + "$merge_name" HEAD $merge_head