From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Dec 2007 21:16:35 +0000 (-0800)
Subject: Revert "git-am: catch missing author date early."
X-Git-Tag: v1.5.4-rc0~72
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3b78959ece0212225ae71efbdf2c1a2183e532f5;p=git.git

Revert "git-am: catch missing author date early."

This reverts commit 6e9e0327b7d7f384d8a223b4bc40330ef3e7fb61.  People
can prepare a text file with Subject: and From: headers and feed it to
"am" (pretending the file is a piece of e-mail), and have actually been
doing so.  Strict checking for Date: breaks this established workflow,
which wants to record the time of the commit as the author time.

Thanks go to Jens Axboe for injection of sanity.

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

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