X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-am.sh;h=85ecada657d21aba4b54034dbaf869f8387d7d02;hb=2e12a089ff1e011689f609aa1a687050a9de2ee4;hp=731ab1fffa4fbe563ab5e2c09cbbdca07e16cac4;hpb=69224716f78d6a772318e73060a70ba5ae67e55b;p=git.git

diff --git a/git-am.sh b/git-am.sh
index 731ab1ff..85ecada6 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -1,11 +1,13 @@
 #!/bin/sh
 #
-#
+# Copyright (c) 2005, 2006 Junio C Hamano
 
 USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>
   or, when resuming [--skip | --resolved]'
 . git-sh-setup
 
+git var GIT_COMMITTER_IDENT >/dev/null || exit
+
 stop_here () {
     echo "$1" >"$dotest/next"
     exit 1
@@ -88,6 +90,10 @@ fall_back_3way () {
     # saying that we reverted all those changes.
 
     git-merge-resolve $orig_tree -- HEAD $his_tree || {
+	    if test -d "$GIT_DIR/rr-cache"
+	    then
+		git-rerere
+	    fi
 	    echo Failed to merge in the changes.
 	    exit 1
     }