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

Re: [PATCH v2 22/24] lock_any_ref_for_update(): inline function

From
Stefan Beller <sbeller@google.com>
Date
Dec 12, 2014, 20:04 UTC
Message-ID
<CAGZ79kaw=BnZzAuP5+Krw_agY=vtocjAiVEFuuwYoNmMnQ6_qw@mail.gmail.com>
In-Reply-To
<1418374623-5566-23-git-send-email-mhagger@alum.mit.edu>
On Fri, Dec 12, 2014 at 12:57 AM, Michael Haggerty <mhagger@alum.mit.edu> wrote:
> Inline the function at its one remaining caller (which is within
> refs.c) and remove it.
>
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Stefan Beller <sbeller@google.com>
Show 62 quoted lines
> ---
>  refs.c | 9 +--------
>  refs.h | 9 +--------
>  2 files changed, 2 insertions(+), 16 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index 618ef9c..166c0f6 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -2346,13 +2346,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
>         return NULL;
>  }
>
> -struct ref_lock *lock_any_ref_for_update(const char *refname,
> -                                        const unsigned char *old_sha1,
> -                                        int flags, int *type_p)
> -{
> -       return lock_ref_sha1_basic(refname, old_sha1, NULL, flags, type_p);
> -}
> -
>  /*
>   * Write an entry to the packed-refs file for the specified refname.
>   * If peeled is non-NULL, write it as the entry's peeled value.
> @@ -4007,7 +4000,7 @@ extern int reflog_expire(const char *refname, const unsigned char *sha1,
>          * reference itself, plus we might need to update the
>          * reference if --updateref was specified:
>          */
> -       lock = lock_any_ref_for_update(refname, sha1, 0, NULL);
> +       lock = lock_ref_sha1_basic(refname, sha1, NULL, 0, NULL);
>         if (!lock)
>                 return error("cannot lock ref '%s'", refname);
>         if (!reflog_exists(refname)) {
> diff --git a/refs.h b/refs.h
> index 4bb58b9..28e7834 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -181,8 +181,7 @@ extern int is_branch(const char *refname);
>  extern int peel_ref(const char *refname, unsigned char *sha1);
>
>  /*
> - * Flags controlling lock_any_ref_for_update(), ref_transaction_update(),
> - * ref_transaction_create(), etc.
> + * Flags controlling ref_transaction_update(), ref_transaction_create(), etc.
>   * REF_NODEREF: act on the ref directly, instead of dereferencing
>   *              symbolic references.
>   * REF_DELETING: tolerate broken refs
> @@ -191,12 +190,6 @@ extern int peel_ref(const char *refname, unsigned char *sha1);
>   */
>  #define REF_NODEREF    0x01
>  #define REF_DELETING   0x02
> -/*
> - * This function sets errno to something meaningful on failure.
> - */
> -extern struct ref_lock *lock_any_ref_for_update(const char *refname,
> -                                               const unsigned char *old_sha1,
> -                                               int flags, int *type_p);
>
>  /*
>   * Setup reflog before using. Set errno to something meaningful on failure.
> --
> 2.1.3
>
Previous: Michael HaggertyNext: Michael Haggerty
Message 28 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.