git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Paul Tan <pyokagan@gmail.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: Small trivial annoyance with the nice new builtin "git am"
Date: Thu, 28 Jul 2016 20:29:03 -0400	[thread overview]
Message-ID: <20160729002902.GD9646@sigill.intra.peff.net> (raw)
In-Reply-To: <CAPc5daX=MoqEXkV7DdpT+J=4K_qNdo0aNu_XgUs+9yggyrMXbQ@mail.gmail.com>

On Thu, Jul 28, 2016 at 04:47:17PM -0700, Junio C Hamano wrote:

> Also makes me wonder if "git cherry-pick A..B" shares the same
> breakage.

Probably.

I guess we want something like:

diff --git a/ident.c b/ident.c
index 139c528..e20a772 100644
--- a/ident.c
+++ b/ident.c
@@ -184,6 +184,11 @@ static const char *ident_default_date(void)
 	return git_default_date.buf;
 }
 
+void reset_ident_date(void)
+{
+	strbuf_reset(&git_default_date);
+}
+
 static int crud(unsigned char c)
 {
 	return  c <= 32  ||

and then to sprinkle calls liberally through builtin-ified programs when
they move from one unit of work to the next.

We could also support resetting the whole ident string, but I don't
think there's any reason to (and unlike the datestamp, it has to do a
bit more looking around to come up with its values).

-Peff

  reply	other threads:[~2016-07-29  0:29 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-28 23:35 Small trivial annoyance with the nice new builtin "git am" Linus Torvalds
2016-07-28 23:47 ` Junio C Hamano
2016-07-29  0:29   ` Jeff King [this message]
2016-07-29  0:37     ` Linus Torvalds
2016-07-29 15:50       ` Jeff King
2016-07-29 17:15         ` Junio C Hamano
2016-07-29 18:05           ` [PATCH] reset cached ident date before creating objects Jeff King
2016-07-29 18:12             ` Linus Torvalds
2016-07-29 18:15             ` Junio C Hamano
2016-07-29 18:25               ` Jeff King
2016-07-30  2:11             ` Paul Tan
2016-07-30  2:41               ` Jeff King
2016-08-01 17:49                 ` Junio C Hamano
2016-08-01 17:58                   ` Junio C Hamano
2016-08-01 18:12                     ` Jeff King
2016-08-01 18:17                       ` Jeff King
2016-08-01 18:00                   ` Jeff King
2016-08-01 19:37                     ` Jeff King
2016-08-01 21:54                       ` Junio C Hamano
2016-08-01 22:00                         ` Jeff King
2016-07-29 18:10       ` Small trivial annoyance with the nice new builtin "git am" Junio C Hamano
2016-07-29 17:06     ` Junio C Hamano
2016-07-29  0:21 ` Jeff King
2016-07-29  0:32   ` Linus Torvalds
2016-07-29  8:19     ` Christian Couder
2016-07-29 17:18     ` 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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=20160729002902.GD9646@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pyokagan@gmail.com \
    --cc=torvalds@linux-foundation.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).