From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Luke Dashjr <luke@dashjr.org>,
git@vger.kernel.org
Subject: Re: GIT_COMMITTER_* and reflog
Date: Sat, 26 Oct 2019 13:37:02 -0400 [thread overview]
Message-ID: <20191026173702.GA5522@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqv9scark1.fsf@gitster-ct.c.googlers.com>
On Sat, Oct 26, 2019 at 04:34:22PM +0900, Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
>
> > If GIT_COMMITTER_{NAME,EMAIL} were used when writing reflogs but
> > GIT_COMMITTER_DATE weren't, would that help with your workflow?
>
> Thanks for a thoughtful response.
>
> My knee-jerk reaction is that it probably was a design bug that came
> out of laziness that we used the usual mechanism to obtain the
> committer date when deciding the timestamp we leave in reflog
> entries. Given that we say master@{6.hours.ago} etc., we should
> base the timestamp on something that is coherent with what the end
> users would give us, e.g. "6.hours.ago". IOW, we should be using
> the wallclock time without paying attention to GIT_COMMITTER_DATE,
> i.e. date.c::get_time().
FWIW, I was about to write a similar response. If people really wanted a
separate reflog ident, I could see introducing $GIT_REFLOG_NAME, etc.
But the current date handling just seems buggy (and an unintended
consequence of reusing the existing ident code).
If somebody wants to pursue a patch, I suspect the solution is probably
something like this (totally untested):
diff --git a/refs/files-backend.c b/refs/files-backend.c
index d60767ab73..2ebf2feeb8 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1658,7 +1658,10 @@ static int files_log_ref_write(struct files_ref_store *refs,
if (logfd < 0)
return 0;
result = log_ref_write_fd(logfd, old_oid, new_oid,
- git_committer_info(0), msg);
+ fmt_ident(getenv("GIT_COMMITTER_NAME"),
+ getenv("GIT_COMMITTER_EMAIL"),
+ WANT_COMMITTER_IDENT, NULL, 0),
+ msg);
if (result) {
struct strbuf sb = STRBUF_INIT;
int save_errno = errno;
-Peff
next prev parent reply other threads:[~2019-10-26 17:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 21:49 GIT_COMMITTER_* and reflog Luke Dashjr
2019-10-26 2:20 ` Jonathan Nieder
2019-10-26 2:43 ` Luke Dashjr
2019-11-07 13:57 ` Philip Oakley
2019-10-26 7:34 ` Junio C Hamano
2019-10-26 17:37 ` Jeff King [this message]
2019-10-27 12:20 ` Junio C Hamano
2019-10-29 14:05 ` Phillip Wood
2019-10-29 14:34 ` Jeff King
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=20191026173702.GA5522@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=luke@dashjr.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).