diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-02 14:38:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-02 14:38:40 -0800 |
| commit | 6e9e0327b7d7f384d8a223b4bc40330ef3e7fb61 (patch) | |
| tree | 84fd11aa21ca59742ef1c075cc3fc699ecf3356e /git-am.sh | |
| parent | ada59fcd3230e661bc1110702a2fb4ef76371bc1 (diff) | |
| download | git-6e9e0327b7d7f384d8a223b4bc40330ef3e7fb61.tar.gz git-6e9e0327b7d7f384d8a223b4bc40330ef3e7fb61.tar.xz | |
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 <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |