Skip to content

Commit 3b78959

Browse files
committed
Revert "git-am: catch missing author date early."
This reverts commit 6e9e032. 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>
1 parent 9e4bbeb commit 3b78959

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-am.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,9 @@ do
307307
GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
308308
GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
309309

310-
if test -z "$GIT_AUTHOR_EMAIL" || test -z "$GIT_AUTHOR_DATE"
310+
if test -z "$GIT_AUTHOR_EMAIL"
311311
then
312-
echo "Patch does not have valid authorship information."
312+
echo "Patch does not have a valid e-mail address."
313313
stop_here $this
314314
fi
315315

0 commit comments

Comments
 (0)