X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=a3665d7751cc836dc669390df7b972c29575037b;hb=42905294de0c1885f5636319c4790f184d767875;hp=2358af62d5eb008ef3d04de67cea7a56aab16526;hpb=93d69d86912c44206543f6670e93f9fc6f2f859f;p=git.git diff --git a/git-pull.sh b/git-pull.sh old mode 100644 new mode 100755 index 2358af62d..a3665d775 --- a/git-pull.sh +++ b/git-pull.sh @@ -4,20 +4,18 @@ # # 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 -usage () { - echo >&2 "usage: $0"' [-n] [--no-commit] [--no-summary] [--help] - [-s strategy]... - [] - ... +test -z "$(git ls-files -u)" || + die "You are in the middle of a conflicted merge." -Fetch one or more remote refs and merge it/them into the current HEAD. -' - exit 1 -} - -strategy_args= no_summary= no_commit= +strategy_args= no_summary= no_commit= squash= while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac do case "$1" in @@ -26,12 +24,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 ;; *) @@ -51,10 +51,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. @@ -64,9 +64,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." + 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 '/ not-for-merge /d' \ @@ -75,22 +83,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 ;; ?*' '?*) - 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 $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