X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-pull.sh;h=e3d11961b0a5a7608648348153bde0ab6e7ccfff;hb=deca7e8c591608c9ffd0bf0aaf10b379da9f6d6e;hp=0c137f19714c6e9c1bed26be6397de37f620ab75;hpb=0493a3fd5204a36bc961a8611770ddb9ec1ed8ed;p=git.git diff --git a/git-pull.sh b/git-pull.sh index 0c137f19..e3d11961 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -6,38 +6,6 @@ . git-sh-setup || die "Not a git archive" -usage () { - die "git pull [-n] [-s strategy]... ..." -} - -strategy_args= no_summary= -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 ;; - -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ - --strateg=*|--strategy=*|\ - -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) - case "$#,$1" in - *,*=*) - strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;; - 1,*) - usage ;; - *) - strategy="$2" - shift ;; - esac - strategy_args="${strategy_args}-s $strategy " - ;; - -*) - usage - ;; - esac - shift -done - orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?" git-fetch --update-head-ok "$@" || exit 1 @@ -59,85 +27,15 @@ fi merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ') case "$merge_head" in -?*' '?*) - 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 - ) - ;; -*) - merge_name="Merge "$(sed -e 's/^[0-9a-f]* //' \ - "$GIT_DIR"/FETCH_HEAD) - ;; -esac - -case "$merge_head" in '') echo >&2 "No changes." exit 0 ;; +*' '?*) + echo >&2 "Pulling more than one heads; making an Octopus." + exec git-octopus + ;; esac -git-merge $no_summary $strategy_args "$merge_name" HEAD $merge_head +merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") +git-resolve "$(cat "$GIT_DIR"/HEAD)" $merge_head "$merge_name"