From: Han-Wen Nienhuys <hanwen@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Han-Wen Nienhuys via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Han-Wen Nienhuys <hanwenn@gmail.com>
Subject: Re: [PATCH 2/4] refs: trim newline from reflog message
Date: Wed, 24 Nov 2021 12:17:04 +0100 [thread overview]
Message-ID: <CAFQ2z_Mb+NzQfXfMhdQoPs09p2j1AWRAdXcX3JSznn+H9+T0Bw@mail.gmail.com> (raw)
In-Reply-To: <xmqqzgpu7grv.fsf@gitster.g>
On Tue, Nov 23, 2021 at 9:34 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Han-Wen Nienhuys <hanwen@google.com> writes:
>
> > I'm talking about refs/refs-internal.h. It seems you want to add something like
> >
> > /* The ref backend should add a '\n' relative to the message supplied
> > to the delete/symref/update functions. */
> > typedef int for_each_reflog_ent_fn(struct ref_store *ref_store,
> > const char *refname,
> > each_reflog_ent_fn fn,
> > void *cb_data);
> >
> > ?
>
> Sorry, I do not follow. Doesn't the ref backend already ensure that
> the message is not an incomplete line? If you feed a single
> complete line when updating, I do not think the backend should add
> any extra LF relative to the given message:
But it does, currently. As of
commit 523fa69c36744ae6779e38614cb9bfb2be552923
Author: Junio C Hamano <gitster@pobox.com>
..
- We expect that a reflog message consists of a single line. The
file format used by the files backend may add a LF after the
it is the job of the files ref backend to add a LF, and the input to
the ref backend is a string without trailing LF. But the files backend
then produces that message with a LF, when reading back the data, eg.
$ git --version
git version 2.34.0.rc2.393.gf8c9666880-goog
$ GIT_TRACE_REFS="1" git branch -m bla blub
..
12:03:59.408705 refs/debug.c:162 rename_ref: refs/heads/bla ->
refs/heads/blub "Branch: renamed refs/heads/bla to refs/heads/blub": 0
$ GIT_TRACE_REFS=1 git reflog show refs/heads/blub
12:04:23.277805 refs/debug.c:294 reflog_ent refs/heads/blub
(ret 0): cd3e606211bb1cf8bc57f7d76bab98cc17a150bc ->
cd3e606211bb1cf8bc57f7d76bab98cc17a150bc, Han-Wen Nienhuys
<hanwen@google.com> 1637751839 "Branch: renamed refs/heads/bla to
refs/heads/blub
"
> I think the rule for "msg" is that:
>
> a multi-line message, or a message on a single incomplete-line,
> are normalized into a single complete line, and callback gets a
> single complete line.
>
That is not how it works today. The files backend verbatimly dumps the
message supplied to it. (Maybe it should crash if there is a '\n' in
the message).
--
Han-Wen Nienhuys - Google Munich
I work 80%. Don't expect answers from me on Fridays.
--
Google Germany GmbH, Erika-Mann-Strasse 33, 80636 Munich
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschäftsführer: Paul Manicle, Halimah DeLaine Prado
next prev parent reply other threads:[~2021-11-24 11:17 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 14:20 [PATCH 0/4] Inspect reflog data programmatically in more tests Han-Wen Nienhuys via GitGitGadget
2021-11-22 14:20 ` [PATCH 1/4] show-branch: show reflog message Han-Wen Nienhuys via GitGitGadget
2021-11-22 22:22 ` Junio C Hamano
2021-11-23 7:40 ` Bagas Sanjaya
2021-11-23 8:03 ` Elijah Newren
2021-11-22 14:20 ` [PATCH 2/4] refs: trim newline from " Han-Wen Nienhuys via GitGitGadget
2021-11-22 22:27 ` Junio C Hamano
2021-11-23 16:35 ` Han-Wen Nienhuys
2021-11-23 17:09 ` Junio C Hamano
2021-11-23 17:28 ` Han-Wen Nienhuys
2021-11-23 20:34 ` Junio C Hamano
2021-11-24 11:17 ` Han-Wen Nienhuys [this message]
2021-11-24 18:53 ` Junio C Hamano
2021-11-24 19:06 ` Han-Wen Nienhuys
2021-11-24 20:55 ` Junio C Hamano
2021-11-25 16:00 ` Han-Wen Nienhuys
2021-11-29 2:30 ` Junio C Hamano
2021-11-24 19:26 ` Junio C Hamano
2021-11-24 19:39 ` Han-Wen Nienhuys
2021-11-26 8:35 ` Re* " Junio C Hamano
2021-11-28 17:50 ` Ævar Arnfjörð Bjarmason
2021-11-28 18:59 ` Junio C Hamano
2021-11-28 19:25 ` Junio C Hamano
2021-11-29 8:39 ` Ævar Arnfjörð Bjarmason
2021-11-23 10:24 ` Ævar Arnfjörð Bjarmason
2021-11-23 16:44 ` Han-Wen Nienhuys
2021-11-22 14:20 ` [PATCH 3/4] test-ref-store: tweaks to for-each-reflog-ent format Han-Wen Nienhuys via GitGitGadget
2021-11-22 22:31 ` Junio C Hamano
2021-11-23 17:06 ` Han-Wen Nienhuys
2021-11-23 18:31 ` Junio C Hamano
2021-11-22 14:20 ` [PATCH 4/4] t1400: use test-helper ref-store to inspect reflog contents Han-Wen Nienhuys via GitGitGadget
2021-11-22 15:20 ` Ævar Arnfjörð Bjarmason
2021-11-22 17:07 ` Han-Wen Nienhuys
2021-11-22 22:22 ` Junio C Hamano
2021-11-25 15:57 ` [PATCH v2 0/5] Inspect reflog data programmatically in more tests Han-Wen Nienhuys via GitGitGadget
2021-11-25 15:57 ` [PATCH v2 1/5] show-branch: show reflog message Han-Wen Nienhuys via GitGitGadget
2021-11-25 15:57 ` [PATCH v2 2/5] test-ref-store: don't add newline to " Han-Wen Nienhuys via GitGitGadget
2021-11-26 7:56 ` Junio C Hamano
2021-11-25 15:57 ` [PATCH v2 3/5] t1405: check for_each_reflog_ent_reverse() more thoroughly Han-Wen Nienhuys via GitGitGadget
2021-11-25 15:57 ` [PATCH v2 4/5] test-ref-store: tweaks to for-each-reflog-ent format Han-Wen Nienhuys via GitGitGadget
2021-11-26 8:02 ` Junio C Hamano
2021-11-25 15:57 ` [PATCH v2 5/5] refs/debug: trim trailing LF from reflog message Han-Wen Nienhuys via GitGitGadget
2021-11-26 8:16 ` Junio C Hamano
2021-11-29 18:29 ` Han-Wen Nienhuys
2021-11-29 19:19 ` Junio C Hamano
2021-11-29 19:35 ` Junio C Hamano
2021-12-02 16:24 ` Han-Wen Nienhuys
2021-12-02 18:36 ` Junio C Hamano
2021-11-29 20:59 ` Ævar Arnfjörð Bjarmason
2021-11-29 9:50 ` [PATCH v2 0/5] Inspect reflog data programmatically in more tests Ævar Arnfjörð Bjarmason
2021-11-29 18:24 ` Han-Wen Nienhuys
2021-11-29 22:30 ` Junio C Hamano
2021-11-29 23:28 ` Ævar Arnfjörð Bjarmason
2021-12-02 16:11 ` Han-Wen Nienhuys
2021-12-02 17:36 ` [PATCH v3 " Han-Wen Nienhuys via GitGitGadget
2021-12-02 17:36 ` [PATCH v3 1/5] show-branch: show reflog message Han-Wen Nienhuys via GitGitGadget
2021-12-02 17:36 ` [PATCH v3 2/5] test-ref-store: don't add newline to " Han-Wen Nienhuys via GitGitGadget
2021-12-02 17:36 ` [PATCH v3 3/5] t1405: check for_each_reflog_ent_reverse() more thoroughly Han-Wen Nienhuys via GitGitGadget
2021-12-02 17:36 ` [PATCH v3 4/5] test-ref-store: tweaks to for-each-reflog-ent format Han-Wen Nienhuys via GitGitGadget
2021-12-02 17:36 ` [PATCH v3 5/5] refs/debug: trim trailing LF from reflog message Han-Wen Nienhuys via GitGitGadget
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=CAFQ2z_Mb+NzQfXfMhdQoPs09p2j1AWRAdXcX3JSznn+H9+T0Bw@mail.gmail.com \
--to=hanwen@google.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=hanwenn@gmail.com \
/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).