Merge branch 'ab/reflog-prep'

[thirdparty/git.git] / refs / files-backend.c

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 5c6d49a267e7f91e74ca0b4149f20d5ca64f3317..b529fdf237eaeabd61ac350c1a42c5e24ec85108 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3082,11 +3082,12 @@ cleanup:
 }
 
 struct expire_reflog_cb {
-       unsigned int flags;
        reflog_expiry_should_prune_fn *should_prune_fn;
        void *policy_cb;
        FILE *newlog;
        struct object_id last_kept_oid;
+       unsigned int rewrite:1,
+                    dry_run:1;
 };
 
 static int expire_reflog_ent(struct object_id *ooid, struct object_id *noid,
@@ -3094,33 +3095,27 @@ static int expire_reflog_ent(struct object_id *ooid, struct object_id *noid,
                             const char *message, void *cb_data)
 {
        struct expire_reflog_cb *cb = cb_data;
-       struct expire_reflog_policy_cb *policy_cb = cb->policy_cb;
+       reflog_expiry_should_prune_fn *fn = cb->should_prune_fn;
 
-       if (cb->flags & EXPIRE_REFLOGS_REWRITE)
+       if (cb->rewrite)
                ooid = &cb->last_kept_oid;
 
-       if ((*cb->should_prune_fn)(ooid, noid, email, timestamp, tz,
-                                  message, policy_cb)) {
-               if (!cb->newlog)
-                       printf("would prune %s", message);
-               else if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
-                       printf("prune %s", message);
-       } else {
-               if (cb->newlog) {
-                       fprintf(cb->newlog, "%s %s %s %"PRItime" %+05d\t%s",
-                               oid_to_hex(ooid), oid_to_hex(noid),
-                               email, timestamp, tz, message);
-                       oidcpy(&cb->last_kept_oid, noid);
-               }
-               if (cb->flags & EXPIRE_REFLOGS_VERBOSE)
-                       printf("keep %s", message);
-       }
+       if (fn(ooid, noid, email, timestamp, tz, message, cb->policy_cb))
+               return 0;
+
+       if (cb->dry_run)
+               return 0; /* --dry-run */
+
+       fprintf(cb->newlog, "%s %s %s %"PRItime" %+05d\t%s", oid_to_hex(ooid),
+               oid_to_hex(noid), email, timestamp, tz, message);
+       oidcpy(&cb->last_kept_oid, noid);
+
        return 0;
 }
 
 static int files_reflog_expire(struct ref_store *ref_store,
                               const char *refname,
-                              unsigned int flags,
+                              unsigned int expire_flags,
                               reflog_expiry_prepare_fn prepare_fn,
                               reflog_expiry_should_prune_fn should_prune_fn,
                               reflog_expiry_cleanup_fn cleanup_fn,
@@ -3138,7 +3133,8 @@ static int files_reflog_expire(struct ref_store *ref_store,
        const struct object_id *oid;
 
        memset(&cb, 0, sizeof(cb));
-       cb.flags = flags;
+       cb.rewrite = !!(expire_flags & EXPIRE_REFLOGS_REWRITE);
+       cb.dry_run = !!(expire_flags & EXPIRE_REFLOGS_DRY_RUN);
        cb.policy_cb = policy_cb_data;
        cb.should_prune_fn = should_prune_fn;
 
@@ -3174,7 +3170,7 @@ static int files_reflog_expire(struct ref_store *ref_store,
 
        files_reflog_path(refs, &log_file_sb, refname);
        log_file = strbuf_detach(&log_file_sb, NULL);
-       if (!(flags & EXPIRE_REFLOGS_DRY_RUN)) {
+       if (!cb.dry_run) {
                /*
                 * Even though holding $GIT_DIR/logs/$reflog.lock has
                 * no locking implications, we use the lock_file
@@ -3201,7 +3197,7 @@ static int files_reflog_expire(struct ref_store *ref_store,
        refs_for_each_reflog_ent(ref_store, refname, expire_reflog_ent, &cb);
        (*cleanup_fn)(cb.policy_cb);
 
-       if (!(flags & EXPIRE_REFLOGS_DRY_RUN)) {
+       if (!cb.dry_run) {
                /*
                 * It doesn't make sense to adjust a reference pointed
                 * to by a symbolic ref based on expiring entries in
@@ -3211,7 +3207,7 @@ static int files_reflog_expire(struct ref_store *ref_store,
                 */
                int update = 0;
 
-               if ((flags & EXPIRE_REFLOGS_UPDATE_REF) &&
+               if ((expire_flags & EXPIRE_REFLOGS_UPDATE_REF) &&
                    !is_null_oid(&cb.last_kept_oid)) {
                        int ignore_errno;
                        int type;