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

refs files-backend: assume cb->newlog if !EXPIRE_REFLOGS_DRY_RUN

Browse Source 
It's not possible for "cb->newlog" to be NULL if
!EXPIRE_REFLOGS_DRY_RUN, since files_reflog_expire() would have
error()'d and taken the "goto failure" branch if it couldn't open the
file. By not using the "newlog" field private to "file-backend.c"'s
"struct expire_reflog_cb", we can move this verbosity logging to
"builtin/reflog.c" in a subsequent commit.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2021-12-22 05:06:47 +01:00
committed by Junio C Hamano
parent 994b328f36
commit 7c28875bcd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
refs/files-backend.c
View File

@ -3105,12 +3105,12 @@ static int expire_reflog_ent(struct object_id *ooid, struct object_id *noid,
if ((*cb->should_prune_fn)(ooid, noid, email, timestamp, tz, if ((*cb->should_prune_fn)(ooid, noid, email, timestamp, tz,
message, policy_cb)) { message, policy_cb)) {
if (!cb->newlog) if (cb->flags & EXPIRE_REFLOGS_DRY_RUN)
printf("would prune %s", message); printf("would prune %s", message);
else if (cb->flags & EXPIRE_REFLOGS_VERBOSE) else if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
printf("prune %s", message); printf("prune %s", message);
} else { } else {
if (cb->newlog) { if (!(cb->flags & EXPIRE_REFLOGS_DRY_RUN)) {
fprintf(cb->newlog, "%s %s %s %"PRItime" %+05d\t%s", fprintf(cb->newlog, "%s %s %s %"PRItime" %+05d\t%s",
oid_to_hex(ooid), oid_to_hex(noid), oid_to_hex(ooid), oid_to_hex(noid),
email, timestamp, tz, message); email, timestamp, tz, message);