X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=git-pull.sh;h=4611ae644e08e4ab115633ab86f1f02976663169;hp=0c137f19714c6e9c1bed26be6397de37f620ab75;hb=HEAD;hpb=0493a3fd5204a36bc961a8611770ddb9ec1ed8ed diff --git a/git-pull.sh b/git-pull.sh index 0c137f19..4611ae64 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -4,19 +4,19 @@ # # 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.' +. git-sh-setup -usage () { - die "git pull [-n] [-s strategy]... ..." -} - -strategy_args= no_summary= +strategy_args= no_summary= no_commit= 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 ;; -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ --strateg=*|--strategy=*|\ -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) @@ -31,17 +31,21 @@ do 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=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?" +orig_head=$(git-rev-parse --verify HEAD) || die "Pulling into a black hole?" git-fetch --update-head-ok "$@" || exit 1 -curr_head=$(cat "$GIT_DIR/HEAD") +curr_head=$(git-rev-parse --verify HEAD) if test "$curr_head" != "$orig_head" then # The fetch involved updating the current branch. @@ -51,93 +55,49 @@ 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: $orig_head commit." + 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 +'') + echo >&2 "No changes." + exit 0 + ;; ?*' '?*) - merge_name="Octopus merge of "$( - perl -e ' - my @src; - my %src; - - sub andjoin { - my ($label, $labels, $stuff, $src) = @_; - my $l = scalar @$stuff; - my $m = ""; - if ($l == 0) { - return ""; - } - if ($l == 1) { - $m = "$label $stuff->[0]"; - } - else { - $m = ("$labels " . - join (", ", @{$stuff}[0..$l-2]) . - " and $stuff->[-1]"); - } - if ($src ne ".") { - $m .= " from $src"; - } - return $m; - } - - while (<>) { - my ($bname, $tname, $gname, $src); - s/^[0-9a-f]* //; - if (s/ of (.*)$//) { - $src = $1; - } else { - $src = "."; - } - if (! exists $src{$src}) { - push @src, $src; - $src{$src} = { BRANCH => [], TAG => [], GENERIC => [] }; - } - if (/^branch (.*)$/) { - push @{$src{$src}{BRANCH}}, $1; - } - elsif (/^tag (.*)$/) { - push @{$src{$src}{TAG}}, $1; - } - else { - push @{$src{$src}{GENERIC}}, $1; - } - } - my @msg; - for my $src (@src) { - my $bag = $src{$src}{BRANCH}; - if (@{$bag}) { - push @msg, andjoin("branch", "branches", $bag, $src); - } - $bag = $src{$src}{TAG}; - if (@{$bag}) { - push @msg, andjoin("tag", "tags", $bag, $src); - } - $bag = $src{$src}{GENERIC}; - if (@{$bag}) { - push @msg, andjoin("commit", "commits", $bag, $src); - } - } - print join("; ", @msg); - ' "$GIT_DIR"/FETCH_HEAD - ) + var=`git-repo-config --get pull.octopus` + if test -n "$var" + then + strategy_default_args="-s $var" + fi ;; *) - merge_name="Merge "$(sed -e 's/^[0-9a-f]* //' \ - "$GIT_DIR"/FETCH_HEAD) + var=`git-repo-config --get pull.twohead` + if test -n "$var" + then + strategy_default_args="-s $var" + fi ;; esac -case "$merge_head" in +case "$strategy_args" in '') - echo >&2 "No changes." - exit 0 + strategy_args=$strategy_default_args ;; esac -git-merge $no_summary $strategy_args "$merge_name" HEAD $merge_head +merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") +git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head