reflog expire: refactor & use "tip_commit" only for UE_NORMAL
Add an intermediate variable for "tip_commit" in reflog_expiry_prepare(), and only add it to the struct if we're handling the UE_NORMAL case. The code behaves the same way as before, but this makes the control flow clearer, and the shorter name allows us to fold a 4-line i/else into a one-line ternary instead. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Dec 22, 2021 at 05:06 UTC
07815e2d97aa177780ea0d67069b5abd0524f936
1 file changed
+7
-7
builtin/reflog.c
+7
-7
@@ -354,16 +354,14 @@ static void reflog_expiry_prepare(const char *refname,
354
{
355
struct expire_reflog_policy_cb *cb = cb_data;
356
struct commit_list *elem;
357
+ struct commit *commit = NULL;
358
359
if (!cb->cmd.expire_unreachable || is_head(refname)) {
360
cb->unreachable_expire_kind = UE_HEAD;
361
} else {
361
- cb->tip_commit = lookup_commit_reference_gently(the_repository,
362
- oid, 1);
363
- if (!cb->tip_commit)
364
- cb->unreachable_expire_kind = UE_ALWAYS;
365
- else
366
- cb->unreachable_expire_kind = UE_NORMAL;
362
+ commit = lookup_commit_reference_gently(the_repository,
363
+ oid, 1);
364
+ cb->unreachable_expire_kind = commit ? UE_NORMAL : UE_ALWAYS;
365
}
366
367
if (cb->cmd.expire_unreachable <= cb->cmd.expire_total)
@@ -378,7 +376,9 @@ static void reflog_expiry_prepare(const char *refname,
376
commit_list_insert(elem->item, &cb->mark_list);
377
break;
378
case UE_NORMAL:
381
- commit_list_insert(cb->tip_commit, &cb->mark_list);
379
+ commit_list_insert(commit, &cb->mark_list);
380
+ /* For reflog_expiry_cleanup() below */
381
+ cb->tip_commit = commit;
382
}
383
cb->mark_limit = cb->cmd.expire_total;
384
mark_reachable(cb);