[PATCH v2 00/24] Add reflog_expire() to the references API · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 03/24] refs.c: add a function to append a reflog entry to a fd · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 04/24] expire_reflog(): it's not an each_ref_fn anymore · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH v2 04/24] expire_reflog(): it's not an each_ref_fn anymore · Stefan Beller <hidden> · 2016-06-15
[PATCH v2 01/24] refs.c: make ref_transaction_create a wrapper for ref_transaction_update · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 09/24] expire_reflog(): extract two policy-related functions · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 16/24] expire_reflog(): move verbose to flags argument · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 14/24] struct expire_reflog_cb: a new callback data type · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 12/24] expire_reflog(): move updateref to flags argument · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 20/24] reflog_expire(): new function in the reference API · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 19/24] expire_reflog(): treat the policy callback data as opaque · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 17/24] expire_reflog(): move rewrite to flags argument · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 24/24] refs.c: let fprintf handle the formatting · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 23/24] refs.c: don't expose the internal struct ref_lock in the header file · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 22/24] lock_any_ref_for_update(): inline function · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH v2 22/24] lock_any_ref_for_update(): inline function · Stefan Beller <hidden> · 2016-06-15
[PATCH v2 21/24] refs.c: remove unlock_ref/close_ref/commit_ref from the refs api · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 13/24] Rename expire_reflog_cb to expire_reflog_policy_cb · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 10/24] expire_reflog(): add a "flags" argument · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 15/24] expire_reflog(): pass flags through to expire_reflog_ent() · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 18/24] Move newlog and last_kept_sha1 to "struct expire_reflog_cb" · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 11/24] expire_reflog(): move dry_run to flags argument · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 07/24] expire_reflog(): use a lock_file for rewriting the reflog file · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH v2 07/24] expire_reflog(): use a lock_file for rewriting the reflog file · Stefan Beller <hidden> · 2016-06-15
[PATCH v2 06/24] expire_reflog(): return early if the reference has no reflog · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH v2 06/24] expire_reflog(): return early if the reference has no reflog · Stefan Beller <hidden> · 2016-06-15
[PATCH v2 08/24] Extract function should_expire_reflog_ent() · Michael Haggerty <hidden> · 2016-06-15
Re: [PATCH v2 08/24] Extract function should_expire_reflog_ent() · Stefan Beller <hidden> · 2016-06-15
[PATCH v2 02/24] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update · Michael Haggerty <hidden> · 2016-06-15
[PATCH v2 05/24] expire_reflog(): rename "ref" parameter to "refname" · Michael Haggerty <hidden> · 2016-06-15

STALE3747d REVIEWED: 1 (0M)

Revision v2 of 2 in this series; 1 review trailer.

Revisions (2)

2016-06-15 v1 [diff vs current]
2016-06-15 v2 current

[PATCH v2 12/24] expire_reflog(): move updateref to flags argument

From: Michael Haggerty <hidden>
Date: 2016-06-15 23:03:16
Subsystem: the rest · Maintainer: Linus Torvalds

The policy objects don't care about "--updateref". So move it to
expire_reflog()'s flags parameter.

Signed-off-by: Michael Haggerty <redacted>
Reviewed-by: Stefan Beller <redacted>
---
 builtin/reflog.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 2f21735..e238fe0 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c

@@ -21,14 +21,14 @@ static unsigned long default_reflog_expire;
 static unsigned long default_reflog_expire_unreachable;
 
 enum expire_reflog_flags {
-	EXPIRE_REFLOGS_DRY_RUN = 1 << 0
+	EXPIRE_REFLOGS_DRY_RUN = 1 << 0,
+	EXPIRE_REFLOGS_UPDATE_REF = 1 << 1
 };
 
 struct cmd_reflog_expire_cb {
 	struct rev_info revs;
 	int stalefix;
 	int rewrite;
-	int updateref;
 	int verbose;
 	unsigned long expire_total;
 	unsigned long expire_unreachable;

@@ -474,7 +474,7 @@ static int expire_reflog(const char *refname, const unsigned char *sha1,
 		if (close_lock_file(&reflog_lock)) {
 			status |= error("couldn't write %s: %s", log_file,
 					strerror(errno));
-		} else if (cmd->updateref &&
+		} else if ((flags & EXPIRE_REFLOGS_UPDATE_REF) &&
 			(write_in_full(lock->lock_fd,
 				sha1_to_hex(cb.last_kept_sha1), 40) != 40 ||
 			 write_str_in_full(lock->lock_fd, "\n") != 1 ||

@@ -485,7 +485,7 @@ static int expire_reflog(const char *refname, const unsigned char *sha1,
 		} else if (commit_lock_file(&reflog_lock)) {
 			status |= error("unable to commit reflog '%s' (%s)",
 					log_file, strerror(errno));
-		} else if (cmd->updateref && commit_ref(lock)) {
+		} else if ((flags & EXPIRE_REFLOGS_UPDATE_REF) && commit_ref(lock)) {
 			status |= error("couldn't set %s", lock->ref_name);
 		}
 	}

@@ -677,7 +677,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 		else if (!strcmp(arg, "--rewrite"))
 			cb.rewrite = 1;
 		else if (!strcmp(arg, "--updateref"))
-			cb.updateref = 1;
+			flags |= EXPIRE_REFLOGS_UPDATE_REF;
 		else if (!strcmp(arg, "--all"))
 			do_all = 1;
 		else if (!strcmp(arg, "--verbose"))

@@ -759,7 +759,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
 		else if (!strcmp(arg, "--rewrite"))
 			cb.rewrite = 1;
 		else if (!strcmp(arg, "--updateref"))
-			cb.updateref = 1;
+			flags |= EXPIRE_REFLOGS_UPDATE_REF;
 		else if (!strcmp(arg, "--verbose"))
 			cb.verbose = 1;
 		else if (!strcmp(arg, "--")) {

-- 
2.1.3