X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=git-am.sh;h=98b9215f700b5cb6a01e39f0f0f0100dcb6e395e;hb=4170a19587280eeb3663a47a6fd993910de78076;hp=f143b7e782ce3b7cc7043c2d00e6cdcc10741bfe;hpb=b3f041fb0f7de167dbb6711b0a231d36c4b5de08;p=git.git
diff --git a/git-am.sh b/git-am.sh
index f143b7e7..98b9215f 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -1,14 +1,10 @@
#!/bin/sh
#
#
-. git-sh-setup
-usage () {
- echo >&2 "usage: $0 [--signoff] [--dotest=
] [--utf8] [--binary] [--3way] "
- echo >&2 " or, when resuming"
- echo >&2 " $0 [--skip | --resolved]"
- exit 1;
-}
+USAGE='[--signoff] [--dotest=] [--utf8] [--binary] [--3way]
+ or, when resuming [--skip | --resolved]'
+. git-sh-setup
stop_here () {
echo "$1" >"$dotest/next"
@@ -92,6 +88,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
}
@@ -215,6 +215,7 @@ this=`cat "$dotest/next"`
if test "$skip" = t
then
this=`expr "$this" + 1`
+ resume=
fi
if test "$this" -gt "$last"
@@ -229,6 +230,7 @@ do
msgnum=`printf "%0${prec}d" $this`
next=`expr "$this" + 1`
test -f "$dotest/$msgnum" || {
+ resume=
go_next
continue
}
@@ -253,6 +255,13 @@ do
GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
+
+ if test -z "$GIT_AUTHOR_EMAIL"
+ then
+ echo "Patch does not have a valid e-mail address."
+ stop_here $this
+ fi
+
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"