mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hn/reflog-tests'

Browse Source 
Prepare tests on ref API to help testing reftable backends.

* hn/reflog-tests:
  refs/debug: trim trailing LF from reflog message
  test-ref-store: tweaks to for-each-reflog-ent format
  t1405: check for_each_reflog_ent_reverse() more thoroughly
  test-ref-store: don't add newline to reflog message
  show-branch: show reflog message
This commit is contained in:
Junio C Hamano
2021-12-15 09:39:48 -08:00
parent 4f7e2f0b21 65279256f3
commit 250ca49b4f
7 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/show-branch.c
View File

@ -761,6 +761,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
char *logmsg;
char *nth_desc;
const char *msg;
char *end;
timestamp_t timestamp;
int tz;
@ -770,11 +771,12 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
reflog = i;
break;
}
msg = strchr(logmsg, '\t');
if (!msg)
msg = "(none)";
else
msg++;
end = strchr(logmsg, '\n');
if (end)
*end = '\0';
msg = (*logmsg == '\0') ? "(none)" : logmsg;
reflog_msg[i] = xstrfmt("(%s) %s",
show_date(timestamp, tz,
DATE_MODE(RELATIVE)),