X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=ed04e7d8d8753cc2cdc7d2737228cb58934534f4;hb=fe142b3a4577a6692a39e2386ed649664ad8bd20;hp=3a139849fbfc545b7c479dd2889a0285fab646d5;hpb=36d277c72d90d32f99616072b64a2652248f5264;p=git.git diff --git a/git-pull.sh b/git-pull.sh index 3a139849f..ed04e7d8d 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -4,20 +4,11 @@ # # Fetch one or more remote refs and merge it/them into the current HEAD. +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 -usage () { - echo >&2 "usage: $0"' [-n] [--no-commit] [--no-summary] [--help] - [-s strategy]... - [] - ... - -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 +17,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 ;; *) @@ -52,7 +45,7 @@ do done orig_head=$(git-rev-parse --verify HEAD) || die "Pulling into a black hole?" -git-fetch --update-head-ok "$@" || exit 1 +git-fetch --update-head-ok --reflog-action=pull "$@" || exit 1 curr_head=$(git-rev-parse --verify HEAD) if test "$curr_head" != "$orig_head" @@ -64,9 +57,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' \ @@ -79,21 +80,17 @@ case "$merge_head" in exit 0 ;; ?*' '?*) - var=`git-var -l | sed -ne 's/^pull\.octopus=/-s /p'` - if test '' = "$var" + var=`git-repo-config --get pull.octopus` + if test -n "$var" then - strategy_default_args='-s octopus' - else - strategy_default_args=$var + strategy_default_args="-s $var" fi ;; *) - var=`git-var -l | sed -ne 's/^pull\.twohead=/-s /p'` - if test '' = "$var" - then - strategy_default_args='-s recursive' - else - strategy_default_args=$var + var=`git-repo-config --get pull.twohead` + if test -n "$var" + then + strategy_default_args="-s $var" fi ;; esac @@ -104,5 +101,7 @@ case "$strategy_args" in ;; esac -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 +git-merge "--reflog-action=pull $*" \ + $no_summary $no_commit $squash $strategy_args \ + "$merge_name" HEAD $merge_head