Revert "Make Octopus merge message a bit nicer."

This reverts 63f1aa6c72c46928f1b6959437aed4becbc42ff3 commit.

diff --git a/git-fetch.sh b/git-fetch.sh
index cbfa27de90baa14b268785a72e1f9c1a91a47f54..822b4cd982c46feaeed9b94b16973b63a0c567c1 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -58,25 +58,21 @@ append_fetch_head () {
     # remote-nick is the URL given on the command line (or a shorthand)
     # remote-name is the $GIT_DIR relative refs/ path we computed
     # for this refspec.
-    remote_1_=$(expr "$remote_" : '\(.*\)\.git/*$') &&
-       remote_="$remote_1_"
-    case "$remote_" in
-    . | ./) where_= ;;
-    *) where_=" of $remote_" ;;
-    esac
     case "$remote_name_" in
     HEAD)
        note_= ;;
     refs/heads/*)
        note_="$(expr "$remote_name_" : 'refs/heads/\(.*\)')"
-       note_="branch '$note_'" ;;
+       note_="branch '$note_' of " ;;
     refs/tags/*)
        note_="$(expr "$remote_name_" : 'refs/tags/\(.*\)')"
-       note_="tag '$note_'" ;;
+       note_="tag '$note_' of " ;;
     *)
-       note_="$remote_name" ;;
+       note_="$remote_name of " ;;
     esac
-    note_="$note_$where_"
+    remote_1_=$(expr "$remote_" : '\(.*\)\.git/*$') &&
+       remote_="$remote_1_"
+    note_="$note_$remote_"
 
     # 2.6.11-tree tag would not be happy to be fed to resolve.
     if git-cat-file commit "$head_" >/dev/null 2>&1

diff --git a/git-pull.sh b/git-pull.sh
index 0c137f19714c6e9c1bed26be6397de37f620ab75..71327a23226017567b00056c9c865135b9fe84fa 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -57,81 +57,10 @@ then
 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
+merge_name=$(
+    perl -e 'print join("; ", map { chomp; s/^[0-9a-f]*        //; $_ } <>)' \
+    "$GIT_DIR"/FETCH_HEAD
+)
 
 case "$merge_head" in
 '')
@@ -140,4 +69,4 @@ case "$merge_head" in
        ;;
 esac
 
-git-merge $no_summary $strategy_args "$merge_name" HEAD $merge_head
+git-merge $no_summary $strategy_args "Merge $merge_name" HEAD $merge_head