Merge branch 'tl/userdiff-csharp-async'

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 2233725315ba32832ec5c866b7dbdf72103ac74d..4719a5354cf182eb91b257a99da97b9b81da5257 100644 (file)
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -52,6 +52,7 @@ struct collect_reflog_cb {
        int nr;
 };
 
+/* Remember to update object flag allocation in object.h */
 #define INCOMPLETE     (1u<<10)
 #define STUDYING       (1u<<11)
 #define REACHABLE      (1u<<12)
@@ -289,20 +290,20 @@ static int should_expire_reflog_ent(struct object_id *ooid, struct object_id *no
                                    const char *message, void *cb_data)
 {
        struct expire_reflog_policy_cb *cb = cb_data;
-       struct commit *old, *new;
+       struct commit *old_commit, *new_commit;
 
        if (timestamp < cb->cmd.expire_total)
                return 1;
 
-       old = new = NULL;
+       old_commit = new_commit = NULL;
        if (cb->cmd.stalefix &&
-           (!keep_entry(&old, ooid) || !keep_entry(&new, noid)))
+           (!keep_entry(&old_commit, ooid) || !keep_entry(&new_commit, noid)))
                return 1;
 
        if (timestamp < cb->cmd.expire_unreachable) {
                if (cb->unreachable_expire_kind == UE_ALWAYS)
                        return 1;
-               if (unreachable(cb, old, ooid) || unreachable(cb, new, noid))
+               if (unreachable(cb, old_commit, ooid) || unreachable(cb, new_commit, noid))
                        return 1;
        }