From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Dec 2007 22:38:40 +0000 (-0800)
Subject: git-am: catch missing author date early.
X-Git-Tag: v1.5.4-rc0~112
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e9e0327b7d7f384d8a223b4bc40330ef3e7fb61;p=git.git

git-am: catch missing author date early.

Even though commit-tree would default to the current time if the incoming
e-mail message somehow did not record the timestamp, it is safer to catch
the breakage sooner.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-am.sh b/git-am.sh
index 76c1c844a..2e4070842 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -307,9 +307,9 @@ do
 	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"
+	if test -z "$GIT_AUTHOR_EMAIL" || test -z "$GIT_AUTHOR_DATE"
 	then
-		echo "Patch does not have a valid e-mail address."
+		echo "Patch does not have valid authorship information."
 		stop_here $this
 	fi