[PATCH v2 5/5] refs/debug: trim trailing LF from reflog message
flat view
STALE1790d
SUPERSEDED
From: Han-Wen Nienhuys via GitGitGadget <hidden>
Date: 2021-11-25 16:10:21
Subsystem:
the rest · Maintainer:
Linus Torvalds
Status: Superseded by v3 (posted 2021-12-02). [go to v3]
Revision v2 (2 revisions archived).
Revisions (2)
- v2 current
- v3 [diff against previous]
From: Han-Wen Nienhuys <redacted> On iteration, the reflog message is always terminated by a newline. Trim it to avoid clobbering the console with is this extra newline. Signed-off-by: Han-Wen Nienhuys <redacted> --- refs/debug.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/refs/debug.c b/refs/debug.c
index 8667c640237..2631210795b 100644
--- a/refs/debug.c
+++ b/refs/debug.c@@ -284,15 +284,21 @@ static int debug_print_reflog_ent(struct object_id *old_oid, int ret; char o[GIT_MAX_HEXSZ + 1] = "null"; char n[GIT_MAX_HEXSZ + 1] = "null"; + struct strbuf trimmed = STRBUF_INIT; if (old_oid) oid_to_hex_r(o, old_oid); if (new_oid) oid_to_hex_r(n, new_oid); + strbuf_addstr(&trimmed, msg); ret = dbg->fn(old_oid, new_oid, committer, timestamp, tz, msg, dbg->cb_data); - trace_printf_key(&trace_refs, "reflog_ent %s (ret %d): %s -> %s, %s %ld \"%s\"\n", - dbg->refname, ret, o, n, committer, (long int)timestamp, msg); + strbuf_trim_trailing_newline(&trimmed); + trace_printf_key(&trace_refs, + "reflog_ent %s (ret %d): %s -> %s, %s %ld \"%s\"\n", + dbg->refname, ret, o, n, committer, + (long int)timestamp, trimmed.buf); + strbuf_release(&trimmed); return ret; }
--
gitgitgadget