git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 04/24] expire_reflog(): it's not an each_ref_fn anymore

From
Stefan Beller <sbeller@google.com>
Date
Dec 12, 2014, 18:09 UTC
Message-ID
<CAGZ79kZOa77DKLnvinhgAVwCeRRXWMD5Krk8QK6N170+oqA-xA@mail.gmail.com>
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:
Show 12 quoted lines
> 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>
Show 50 quoted lines
> ---
>  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
>
Previous: Michael HaggertyNext: Michael Haggerty
Message 6 of 31 in “Add reflog_expire() to the references API”
  1. 00/24 Add reflog_expire() to the references APIMichael Haggerty, Dec 12, 2014
  2. 01/24 refs.c: make ref_transaction_create a wrapper for ref_transaction_updateMichael Haggerty, Dec 12, 2014
  3. 02/24 refs.c: make ref_transaction_delete a wrapper for ref_transaction_updateMichael Haggerty, Dec 12, 2014
  4. 03/24 refs.c: add a function to append a reflog entry to a fdMichael Haggerty, Dec 12, 2014
  5. 04/24 expire_reflog(): it's not an each_ref_fn anymoreMichael Haggerty, Dec 12, 2014
  6. Stefan BellerDec 12, 2014
  7. 05/24 expire_reflog(): rename "ref" parameter to "refname"Michael Haggerty, Dec 12, 2014
  8. 06/24 expire_reflog(): return early if the reference has no reflogMichael Haggerty, Dec 12, 2014
  9. Stefan BellerDec 12, 2014
  10. 07/24 expire_reflog(): use a lock_file for rewriting the reflog fileMichael Haggerty, Dec 12, 2014
  11. Stefan BellerDec 12, 2014
  12. 08/24 Extract function should_expire_reflog_ent()Michael Haggerty, Dec 12, 2014
  13. Stefan BellerDec 12, 2014
  14. 09/24 expire_reflog(): extract two policy-related functionsMichael Haggerty, Dec 12, 2014
  15. 10/24 expire_reflog(): add a "flags" argumentMichael Haggerty, Dec 12, 2014
  16. 11/24 expire_reflog(): move dry_run to flags argumentMichael Haggerty, Dec 12, 2014
  17. 12/24 expire_reflog(): move updateref to flags argumentMichael Haggerty, Dec 12, 2014
  18. 13/24 Rename expire_reflog_cb to expire_reflog_policy_cbMichael Haggerty, Dec 12, 2014
  19. 14/24 struct expire_reflog_cb: a new callback data typeMichael Haggerty, Dec 12, 2014
  20. 15/24 expire_reflog(): pass flags through to expire_reflog_ent()Michael Haggerty, Dec 12, 2014
  21. 16/24 expire_reflog(): move verbose to flags argumentMichael Haggerty, Dec 12, 2014
  22. 17/24 expire_reflog(): move rewrite to flags argumentMichael Haggerty, Dec 12, 2014
  23. 18/24 Move newlog and last_kept_sha1 to "struct expire_reflog_cb"Michael Haggerty, Dec 12, 2014
  24. 19/24 expire_reflog(): treat the policy callback data as opaqueMichael Haggerty, Dec 12, 2014
  25. 20/24 reflog_expire(): new function in the reference APIMichael Haggerty, Dec 12, 2014
  26. 21/24 refs.c: remove unlock_ref/close_ref/commit_ref from the refs apiMichael Haggerty, Dec 12, 2014
  27. 22/24 lock_any_ref_for_update(): inline functionMichael Haggerty, Dec 12, 2014
  28. Stefan BellerDec 12, 2014
  29. 23/24 refs.c: don't expose the internal struct ref_lock in the header fileMichael Haggerty, Dec 12, 2014
  30. 24/24 refs.c: let fprintf handle the formattingMichael Haggerty, Dec 12, 2014
  31. Junio C HamanoDec 12, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.