Re: [PATCH 1/4] test-ref-store: tweaks to for-each-reflog-ent format
flat view
From: Taylor Blau <hidden>
Date: 2021-08-30 20:23:19
On Mon, Aug 30, 2021 at 02:48:45PM +0000, Han-Wen Nienhuys via GitGitGadget wrote:
quoted hunk ↗ jump to hunk
From: Han-Wen Nienhuys <redacted> Follow the reflog format more closely, so it can be used for comparing reflogs in tests without using inspecting files under .git/logs/ Signed-off-by: Han-Wen Nienhuys <redacted> --- t/helper/test-ref-store.c | 6 +++--- t/t1405-main-ref-store.sh | 5 +++-- t/t1406-submodule-ref-store.sh | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-)diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c index b314b81a45b..d7bbb20e614 100644 --- a/t/helper/test-ref-store.c +++ b/t/helper/test-ref-store.c@@ -151,9 +151,9 @@ static int each_reflog(struct object_id *old_oid, struct object_id *new_oid, const char *committer, timestamp_t timestamp, int tz, const char *msg, void *cb_data) { - printf("%s %s %s %"PRItime" %d %s\n", - oid_to_hex(old_oid), oid_to_hex(new_oid), - committer, timestamp, tz, msg); + const char *newline = strchr(msg, '\n') ? "" : "\n"; + printf("%s %s %s %" PRItime " %+05d\t%s%s", oid_to_hex(old_oid), + oid_to_hex(new_oid), committer, timestamp, tz, msg, newline);
Having read the rest of the series, I did scratch my head quite a bit here, but I think the change is actually quite simple. In the files backend, show_one_reflog_ent is parsing line-wise, and each line ends with the LF. Of course, we don't expect the reflog to have messages that actually contain a newline because we cleanse them with copy_reflog_message() before writing. So really it seems like the files-backend should be calling rstrip on the message before handing it to the callback. Either that, or we could call rstrip ourselves (since the generic strchr() makes me think that the LF could appear anywhere in the string, at least on first read). Thanks, Taylor