git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Len Brown <lenb@kernel.org>
To: git@vger.kernel.org
Subject: Re: git-am: catch missing author date early.
Date: Thu, 6 Dec 2007 21:34:47 -0500	[thread overview]
Message-ID: <200712062134.47330.lenb@kernel.org> (raw)

This change made git-am more difficult to use.

I tend to check-in a fair number of patches that didn't come from an e-mail message.
In the past, I slap a Subject: and a From: on the top of the commit message
and off I go.

With this change git-am fails b/c I haven't also conjured up the time,
when in the past it figured out what time it was for me.

thanks,
-Len

commit 6e9e0327b7d7f384d8a223b4bc40330ef3e7fb61
Author: Junio C Hamano <gitster@pobox.com>
Date:   Sun Dec 2 14:38:40 2007 -0800

    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>

diff --git a/git-am.sh b/git-am.sh
index 76c1c84..2e40708 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"
+	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
 

             reply	other threads:[~2007-12-07  2:35 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-12-07  2:34 Len Brown [this message]
2007-12-07  6:06 ` git-am: catch missing author date early Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200712062134.47330.lenb@kernel.org \
    --to=lenb@kernel.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).