From: Stefan Beller <sbeller@google.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Ronnie Sahlberg <ronniesahlberg@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH v2 04/24] expire_reflog(): it's not an each_ref_fn anymore
Date: Fri, 12 Dec 2014 10:09:55 -0800 [thread overview]
Message-ID: <CAGZ79kZOa77DKLnvinhgAVwCeRRXWMD5Krk8QK6N170+oqA-xA@mail.gmail.com> (raw)
In-Reply-To: <1418374623-5566-5-git-send-email-mhagger@alum.mit.edu>
On Fri, Dec 12, 2014 at 12:56 AM, Michael Haggerty <mhagger@alum.mit.edu> wrote:
> Prior to v1.5.4~14, expire_reflog() had to be an each_ref_fn because
> it was passed to for_each_reflog(). Since then, there has been no
> reason for it to implement the each_ref_fn interface. So...
>
> * Remove the "unused" parameter (which took the place of "flags", but
> was really unused).
>
> * Declare the last parameter to be (struct cmd_reflog_expire_cb *)
> rather than (void *).
>
> Helped-by: Jonathan Nieder <jrnieder@gmail.com>
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Stefan Beller <sbeller@google.com>
> ---
> builtin/reflog.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/builtin/reflog.c b/builtin/reflog.c
> index 2d85d26..160541a 100644
> --- a/builtin/reflog.c
> +++ b/builtin/reflog.c
> @@ -349,9 +349,9 @@ static int push_tip_to_list(const char *refname, const unsigned char *sha1, int
> return 0;
> }
>
> -static int expire_reflog(const char *ref, const unsigned char *sha1, int unused, void *cb_data)
> +static int expire_reflog(const char *ref, const unsigned char *sha1,
> + struct cmd_reflog_expire_cb *cmd)
> {
> - struct cmd_reflog_expire_cb *cmd = cb_data;
> struct expire_reflog_cb cb;
> struct ref_lock *lock;
> char *log_file, *newlog_path = NULL;
> @@ -663,7 +663,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
> for (i = 0; i < collected.nr; i++) {
> struct collected_reflog *e = collected.e[i];
> set_reflog_expiry_param(&cb, explicit_expiry, e->reflog);
> - status |= expire_reflog(e->reflog, e->sha1, 0, &cb);
> + status |= expire_reflog(e->reflog, e->sha1, &cb);
> free(e);
> }
> free(collected.e);
> @@ -677,7 +677,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
> continue;
> }
> set_reflog_expiry_param(&cb, explicit_expiry, ref);
> - status |= expire_reflog(ref, sha1, 0, &cb);
> + status |= expire_reflog(ref, sha1, &cb);
> }
> return status;
> }
> @@ -748,7 +748,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
> cb.expire_total = 0;
> }
>
> - status |= expire_reflog(ref, sha1, 0, &cb);
> + status |= expire_reflog(ref, sha1, &cb);
> free(ref);
> }
> return status;
> --
> 2.1.3
>
next prev parent reply other threads:[~2014-12-12 18:11 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 [this message]
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 ` [PATCH v2 12/24] expire_reflog(): move updateref " Michael Haggerty
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGZ79kZOa77DKLnvinhgAVwCeRRXWMD5Krk8QK6N170+oqA-xA@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=ronniesahlberg@gmail.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.
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 NNTP newsgroup(s).