From 6e9e0327b7d7f384d8a223b4bc40330ef3e7fb61 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 2 Dec 2007 14:38:40 -0800 Subject: [PATCH] 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 --- git-am.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-am.sh b/git-am.sh index 76c1c844a9..2e40708426 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 -- 2.11.4.GIT