From: Jeff King <peff@peff.net>
To: Paul Tan <pyokagan@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] reset cached ident date before creating objects
Date: Fri, 29 Jul 2016 22:41:36 -0400 [thread overview]
Message-ID: <20160730024135.oaqtjpo5l2e3dam2@sigill.intra.peff.net> (raw)
In-Reply-To: <CACRoPnS2kDRLiY8KX3K4Havh7d1GWy3mUXSiYCzw45BznuwYeA@mail.gmail.com>
On Sat, Jul 30, 2016 at 10:11:56AM +0800, Paul Tan wrote:
> > diff --git a/commit.c b/commit.c
> > index 71a360d..7ddbffe 100644
> > --- a/commit.c
> > +++ b/commit.c
> > @@ -1548,6 +1548,7 @@ int commit_tree_extended(const char *msg, size_t msg_len,
> > }
> >
> > /* Person/date information */
> > + reset_ident_date();
> > if (!author)
> > author = git_author_info(IDENT_STRICT);
> > strbuf_addf(&buffer, "author %s\n", author);
>
> But since builtin/commit.c constructs its author ident string before
> calling the editor and then commit_tree_extended(), this would cause
> the resulting commits to have committer timestamps which differ from
> their author timestamps.
Hrm, yeah. I assumed it would only pass in the author string for things
like "-c" or "--amend". But it looks like it unconditionally passes in
the author. And it would be slightly difficult to have it pass NULL,
because it may actually have _part_ of an author (e.g., "--author" will
come up with name and email but not the date), so it has to sometimes
combine those bits with things like ident_default_date() itself.
I guess one option would be to commit_tree_extended() to take the
broken-down author bits and call fmt_ident() itself. That's what all of
the callers are doing (that, or just passing NULL). It would make the
interface a bit clunkier, but I think the end result would be more
flexible.
I suppose that would be tricky for git-commit, because in addition to
passing the result of fmt_ident() to commit_tree_extended(), it wants to
take the pieces and put them in the environment for hooks to see. And if
the data is available only inside commit_tree_extended(), we don't have
it for the hooks.
> So maybe we would have to put reset_ident_date() at the end of the
> function instead, at least after git_committer_info() is called.
Yes, although "reset and end" still feels a bit weird to me.
I'd almost prefer to just have long-running programs insert resets at
strategic points.
-Peff
next prev parent reply other threads:[~2016-07-30 2:41 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
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 [this message]
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=20160730024135.oaqtjpo5l2e3dam2@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).