Optionally support old diffs

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

index a221daa..74f0761 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -3,15 +3,13 @@
  # Copyright (c) 2005 Junio C Hamano
  #
  
+
+USAGE='[-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+'
  . git-sh-setup
  
  LF='
  '
  
-usage () {
-    die "git-merge [-n] [--no-commit] [-s <strategy>]... <merge-message> <head> <remote>+"
-}
-
  all_strategies='recursive octopus resolve stupid ours'
  default_strategies='recursive'
  use_strategies=
@@ -97,11 +95,14 @@ head=$(git-rev-parse --verify "$1"^0) || usage
  shift
  
  # All the rest are remote heads
+remoteheads=
  for remote
  do
-       git-rev-parse --verify "$remote"^0 >/dev/null ||
+       remotehead=$(git-rev-parse --verify "$remote"^0) ||
             die "$remote - not something we can merge"
+       remoteheads="${remoteheads}$remotehead "
  done
+set x $remoteheads ; shift
  
  case "$#" in
  1)
@@ -208,6 +209,7 @@ case "$use_strategies" in
  esac
  
  result_tree= best_cnt=-1 best_strategy= wt_strategy=
+merge_was_ok=
  for strategy in $use_strategies
  do
      test "$wt_strategy" = '' || {
@@ -227,6 +229,7 @@ do
      exit=$?
      if test "$no_commit" = t && test "$exit" = 0
      then
+        merge_was_ok=t
         exit=1 ;# pretend it left conflicts.
      fi
  
@@ -290,6 +293,25 @@ for remote
  do
         echo $remote
  done >"$GIT_DIR/MERGE_HEAD"
-echo $merge_msg >"$GIT_DIR/MERGE_MSG"
+echo "$merge_msg" >"$GIT_DIR/MERGE_MSG"
  
-die "Automatic merge failed/prevented; fix up by hand"
+if test "$merge_was_ok" = t
+then
+       echo >&2 \
+       "Automatic merge went well; stopped before committing as requested"
+       exit 0
+else
+       {
+           echo '
+Conflicts:
+'
+               git ls-files --unmerged |
+               sed -e 's/^[^   ]*      /       /' |
+               uniq
+       } >>"$GIT_DIR/MERGE_MSG"
+       if test -d "$GIT_DIR/rr-cache"
+       then
+               git-rerere
+       fi
+       die "Automatic merge failed; fix up by hand"
+fi