fmt-merge-msg: fix off-by-one bug

[git.git] / git-merge.sh
diff --git a/git-merge.sh b/git-merge.sh

index fc25f8dda01ecf4733165308d9fb1fa80dffbe0c..d049e164318a416941334b15699d52f87b00387f 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -9,15 +9,20 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>]... <merge-message> <head> <
  LF='
  '
  
-all_strategies='recursive octopus resolve stupid ours'
-default_twohead_strategies='recursive'
+all_strategies='recursive recur octopus resolve stupid ours'
+case "${GIT_USE_RECUR_FOR_RECURSIVE}" in
+'')
+       default_twohead_strategies=recursive ;;
+?*)
+       default_twohead_strategies=recur ;;
+esac
  default_octopus_strategies='octopus'
  no_trivial_merge_strategies='ours'
  use_strategies=
  
  index_merge=t
  if test "@@NO_PYTHON@@"; then
-       all_strategies='resolve octopus stupid ours'
+       all_strategies='recur resolve octopus stupid ours'
         default_twohead_strategies='resolve'
  fi
  
@@ -58,7 +63,13 @@ squash_message () {
  }
  
  finish () {
-       test '' = "$2" || echo "$2"
+       if test '' = "$2"
+       then
+               rlogm="$rloga"
+       else
+               echo "$2"
+               rlogm="$rloga: $2"
+       fi
         case "$squash" in
         t)
                 echo "Squash commit -- not updating HEAD"
@@ -70,7 +81,7 @@ finish () {
                         echo "No merge message -- not updating HEAD"
                         ;;
                 *)
-                       git-update-ref HEAD "$1" "$head" || exit 1
+                       git-update-ref -m "$rlogm" HEAD "$1" "$head" || exit 1
                         ;;
                 esac
                 ;;
@@ -88,6 +99,7 @@ finish () {
         esac
  }
  
+rloga=
  while case "$#" in 0) break ;; esac
  do
         case "$1" in
@@ -103,13 +115,17 @@ do
         -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
                 case "$#,$1" in
                 *,*=*)
-                       strategy=`expr "$1" : '-[^=]*=\(.*\)'` ;;
+                       strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;;
                 1,*)
                         usage ;;
                 *)
                         strategy="$2"
                         shift ;;
                 esac
+               case "$strategy,${GIT_USE_RECUR_FOR_RECURSIVE}" in
+               recursive,?*)
+                       strategy=recur ;;
+               esac
                 case " $all_strategies " in
                 *" $strategy "*)
                         use_strategies="$use_strategies$strategy " ;;
@@ -117,6 +133,9 @@ do
                         die "available strategies are: $all_strategies" ;;
                 esac
                 ;;
+       --reflog-action=*)
+               rloga=`expr "z$1" : 'z-[^=]*=\(.*\)'`
+               ;;
         -*)     usage ;;
         *)      break ;;
         esac
@@ -131,6 +150,7 @@ shift
  
  # All the rest are remote heads
  test "$#" = 0 && usage ;# we need at least one remote head.
+test "$rloga" = '' && rloga="merge: $@"
  
  remoteheads=
  for remote
@@ -316,7 +336,7 @@ if test '' != "$result_tree"
  then
      parents=$(git-show-branch --independent "$head" "$@" | sed -e 's/^/-p /')
      result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents) || exit
-    finish "$result_commit" "Merge $result_commit, made by $wt_strategy."
+    finish "$result_commit" "Merge made by $wt_strategy."
      dropsave
      exit 0
  fi