From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Stefan Beller <sbeller@google.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Ronnie Sahlberg <ronniesahlberg@gmail.com>,
git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v2 12/24] expire_reflog(): move updateref to flags argument
Date: Fri, 12 Dec 2014 09:56:51 +0100 [thread overview]
Message-ID: <1418374623-5566-13-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1418374623-5566-1-git-send-email-mhagger@alum.mit.edu>
The policy objects don't care about "--updateref". So move it to
expire_reflog()'s flags parameter.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Stefan Beller <sbeller@google.com>
---
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
next prev parent reply other threads:[~2014-12-12 8:57 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-12 8:56 [PATCH v2 00/24] Add reflog_expire() to the references API Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 01/24] refs.c: make ref_transaction_create a wrapper for ref_transaction_update Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 02/24] refs.c: make ref_transaction_delete " Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 03/24] refs.c: add a function to append a reflog entry to a fd Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 04/24] expire_reflog(): it's not an each_ref_fn anymore Michael Haggerty
2014-12-12 18:09 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 05/24] expire_reflog(): rename "ref" parameter to "refname" Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 06/24] expire_reflog(): return early if the reference has no reflog Michael Haggerty
2014-12-12 18:15 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 07/24] expire_reflog(): use a lock_file for rewriting the reflog file Michael Haggerty
2014-12-12 18:57 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 08/24] Extract function should_expire_reflog_ent() Michael Haggerty
2014-12-12 20:02 ` Stefan Beller
2014-12-12 8:56 ` [PATCH v2 09/24] expire_reflog(): extract two policy-related functions Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 10/24] expire_reflog(): add a "flags" argument Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 11/24] expire_reflog(): move dry_run to flags argument Michael Haggerty
2014-12-12 8:56 ` Michael Haggerty [this message]
2014-12-12 8:56 ` [PATCH v2 13/24] Rename expire_reflog_cb to expire_reflog_policy_cb Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 14/24] struct expire_reflog_cb: a new callback data type Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 15/24] expire_reflog(): pass flags through to expire_reflog_ent() Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 16/24] expire_reflog(): move verbose to flags argument Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 17/24] expire_reflog(): move rewrite " Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 18/24] Move newlog and last_kept_sha1 to "struct expire_reflog_cb" Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 19/24] expire_reflog(): treat the policy callback data as opaque Michael Haggerty
2014-12-12 8:56 ` [PATCH v2 20/24] reflog_expire(): new function in the reference API Michael Haggerty
2014-12-12 8:57 ` [PATCH v2 21/24] refs.c: remove unlock_ref/close_ref/commit_ref from the refs api Michael Haggerty
2014-12-12 8:57 ` [PATCH v2 22/24] lock_any_ref_for_update(): inline function Michael Haggerty
2014-12-12 20:04 ` Stefan Beller
2014-12-12 8:57 ` [PATCH v2 23/24] refs.c: don't expose the internal struct ref_lock in the header file Michael Haggerty
2014-12-12 8:57 ` [PATCH v2 24/24] refs.c: let fprintf handle the formatting Michael Haggerty
2014-12-12 20:58 ` [PATCH v2 00/24] Add reflog_expire() to the references API Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1418374623-5566-13-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=ronniesahlberg@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).