X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-am.sh;h=85ecada657d21aba4b54034dbaf869f8387d7d02;hb=6ead3972f54e290b255b9c5379a2f9a35ec9f847;hp=1a114bcc0809836ed4edaa0866704b899e587cd2;hpb=1ed91937e5cd59fdbdfa5f15f6fac132d2b21ce0;p=git.git
diff --git a/git-am.sh b/git-am.sh
index 1a114bcc..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=
] [--utf8] [--binary] [--3way]
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
}
@@ -211,6 +217,7 @@ this=`cat "$dotest/next"`
if test "$skip" = t
then
this=`expr "$this" + 1`
+ resume=
fi
if test "$this" -gt "$last"
@@ -225,6 +232,7 @@ do
msgnum=`printf "%0${prec}d" $this`
next=`expr "$this" + 1`
test -f "$dotest/$msgnum" || {
+ resume=
go_next
continue
}