git-upload-pack: More efficient usage of the has_sha1 array

[git.git] / git-pull.sh

diff --git a/git-pull.sh b/git-pull.sh
index 0c137f1..d476518 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -32,16 +32,17 @@ do
                strategy_args="${strategy_args}-s $strategy "
                ;;
        -*)
-               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.
@@ -56,88 +57,28 @@ then
                die "You need to first update your working tree."
 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
-       )
+       strategy_default_args='-s octopus'
        ;;
 *)
-       merge_name="Merge "$(sed -e 's/^[0-9a-f]*       //' \
-               "$GIT_DIR"/FETCH_HEAD)
+       strategy_default_args='-s resolve'
        ;;
 esac
 
-case "$merge_head" in
+case "$strategy_args" in
 '')
-       echo >&2 "No changes."
-       exit 0
+       strategy_args=$strategy_default_args
        ;;
 esac
 
+merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
 git-merge $no_summary $strategy_args "$merge_name" HEAD $merge_head