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

PATCH New Junio C Hamano 1 participant 1 message Jun 15, 2016 2 messages not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Junio C Hamano

author

2016-06-15 22:43 UTC #2 lore raw

PATCH 1/1 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 <[email protected]>

---
 git-am.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

git-am.sh +2 -2

index 2e40708..76c1c84 100755
@@ -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

Signature · 1 line

1.5.3.7-2132-gbd1cf