Browse Source

refs/debug: trim trailing LF from reflog message

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 <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Han-Wen Nienhuys 3 years ago committed by Junio C Hamano
parent
commit
65279256f3
  1. 7
      refs/debug.c

7
refs/debug.c

@ -284,6 +284,7 @@ static int debug_print_reflog_ent(struct object_id *old_oid, @@ -284,6 +284,7 @@ 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";
char *msgend = strchrnul(msg, '\n');
if (old_oid)
oid_to_hex_r(o, old_oid);
if (new_oid)
@ -291,8 +292,10 @@ static int debug_print_reflog_ent(struct object_id *old_oid, @@ -291,8 +292,10 @@ static int debug_print_reflog_ent(struct object_id *old_oid,

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);
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, (int)(msgend - msg), msg);
return ret;
}


Loading…
Cancel
Save