summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-05 13:16:35 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-05 13:16:35 -0800
commit3b78959ece0212225ae71efbdf2c1a2183e532f5 (patch)
tree4275e5fea09f1e5837a9db2a4c26b2f91eea9929 /git-am.sh
parent9e4bbeb95f5c9d046b671070eb35b3aa6f3ec5e6 (diff)
downloadgit-3b78959ece0212225ae71efbdf2c1a2183e532f5.tar.gz
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>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-am.sh b/git-am.sh
index 2e40708426..76c1c844a9 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