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

Re: [PATCH 15/15] refs.c: allow deleting refs with a broken sha1

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Jul 23, 2014, 21:22 UTC
Message-ID
<CAPig+cS3JETqxMi7bBvyb=kamWyqvPkLXmwsDd_G+K16EDxotw@mail.gmail.com>
In-Reply-To
<1406135035-26441-16-git-send-email-sahlberg@google.com>
On Wed, Jul 23, 2014 at 1:03 PM, Ronnie Sahlberg <sahlberg@google.com> wrote:
Show 9 quoted lines
> Add (back?) support to make it possible to delete refs that are broken.
>
> Add a new flag REF_ALLOWBROKEN that can be passed to the functions to
> lock a ref. If this flag is set we allow locking the ref even if the
> ref points to a broken sha1. For example a sha1 that is created by :
>
>    echo "Broken ref" > .git/refs/heads/foo-broken-1
>
> Use this flag when calling from branch.c dusing a ref delete so that we
Presumably: s/dusing/doing/
Show 103 quoted lines
> only allow locking those broken refs IFF when called during a branch
> delete.
>
> Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
> ---
>  builtin/branch.c |  6 ++++--
>  refs.c           | 10 +++++++---
>  refs.h           |  3 ++-
>  3 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 5c95656..6d70037 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -236,6 +236,8 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
>                 name = mkpathdup(fmt, bname.buf);
>                 target = resolve_ref_unsafe(name, sha1,
>                                             RESOLVE_REF_ALLOW_BAD_NAME, &flags);
> +               if (!target && (flags & REF_ISBROKEN))
> +                       target = name;
>                 if (!target ||
>                     (!(flags & REF_ISSYMREF) && is_null_sha1(sha1))) {
>                         error(remote_branch
> @@ -245,14 +247,14 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
>                         continue;
>                 }
>
> -               if (!(flags & REF_ISSYMREF) &&
> +               if (!(flags & (REF_ISSYMREF|REF_ISBROKEN)) &&
>                     check_branch_commit(bname.buf, name, sha1, head_rev, kinds,
>                                         force)) {
>                         ret = 1;
>                         continue;
>                 }
>
> -               if (delete_ref(name, sha1, REF_NODEREF)) {
> +               if (delete_ref(name, sha1, REF_NODEREF|REF_ALLOWBROKEN)) {
>                         error(remote_branch
>                               ? _("Error deleting remote branch '%s'")
>                               : _("Error deleting branch '%s'"),
> diff --git a/refs.c b/refs.c
> index 0ead11f..2662ef6 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -2122,12 +2122,12 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
>         int resolve_flags;
>         int missing = 0;
>         int attempts_remaining = 3;
> -       int bad_refname;
> +       int bad_ref;
>
>         lock = xcalloc(1, sizeof(struct ref_lock));
>         lock->lock_fd = -1;
>
> -       bad_refname = check_refname_format(refname, REFNAME_ALLOW_ONELEVEL);
> +       bad_ref = check_refname_format(refname, REFNAME_ALLOW_ONELEVEL);
>
>         resolve_flags = RESOLVE_REF_ALLOW_BAD_NAME;
>         if (mustexist)
> @@ -2150,6 +2150,10 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
>                 refname = resolve_ref_unsafe(orig_refname, lock->old_sha1,
>                                              resolve_flags, &type);
>         }
> +       if (!refname && (flags & REF_ALLOWBROKEN) && (type & REF_ISBROKEN)) {
> +               bad_ref = 1;
> +               refname = orig_refname;
> +       }
>         if (type_p)
>             *type_p = type;
>         if (!refname) {
> @@ -2212,7 +2216,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
>                 else
>                         unable_to_lock_index_die(ref_file, errno);
>         }
> -       if (bad_refname)
> +       if (bad_ref)
>                 return lock;
>         return old_sha1 ? verify_lock(lock, old_sha1, mustexist) : lock;
>
> diff --git a/refs.h b/refs.h
> index 712fc32..0172f48 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -174,10 +174,11 @@ extern int peel_ref(const char *refname, unsigned char *sha1);
>   * Flags controlling transaction_update_sha1(), transaction_create_sha1(), etc.
>   * REF_NODEREF: act on the ref directly, instead of dereferencing
>   *              symbolic references.
> - *
> + * REF_ALLOWBROKEN: allow locking refs that are broken.
>   * Flags >= 0x100 are reserved for internal use.
>   */
>  #define REF_NODEREF    0x01
> +#define REF_ALLOWBROKEN 0x02
>
>  /** Reads log for the value of ref during at_time. **/
>  extern int read_ref_at(const char *refname, unsigned long at_time, int cnt,
> --
> 2.0.1.508.g763ab16
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous: Ronnie SahlbergNext: Junio C Hamano
Message 18 of 19 in “ref-transactions for reflogs”
  1. 00/15 ref-transactions for reflogsRonnie Sahlberg, Jul 23, 2014
  2. 01/15 refs.c make ref_transaction_create a wrapper to ref_transaction_updateRonnie Sahlberg, Jul 23, 2014
  3. Junio C HamanoJul 23, 2014
  4. 02/15 refs.c: make ref_transaction_delete a wrapper for ref_transaction_updateRonnie Sahlberg, Jul 23, 2014
  5. 03/15 refs.c: rename the transaction functionsRonnie Sahlberg, Jul 23, 2014
  6. 04/15 refs.c: add a new update_type field to ref_updateRonnie Sahlberg, Jul 23, 2014
  7. 05/15 refs.c: add a function to append a reflog entry to a fdRonnie Sahlberg, Jul 23, 2014
  8. 06/15 lockfile.c: make hold_lock_file_for_append preserve meaningful errnoRonnie Sahlberg, Jul 23, 2014
  9. 07/15 refs.c: add a transaction function to append a reflog entryRonnie Sahlberg, Jul 23, 2014
  10. 08/15 refs.c: add a flag to allow reflog updates to truncate the logRonnie Sahlberg, Jul 23, 2014
  11. 09/15 refs.c: only write reflog update if msg is non-NULLRonnie Sahlberg, Jul 23, 2014
  12. 10/15 refs.c: allow multiple reflog updates during a single transactionRonnie Sahlberg, Jul 23, 2014
  13. 11/15 reflog.c: use a reflog transaction when writing during expireRonnie Sahlberg, Jul 23, 2014
  14. 12/15 refs.c: rename log_ref_setup to create_reflogRonnie Sahlberg, Jul 23, 2014
  15. 13/15 refs.c: make unlock_ref/close_ref/commit_ref staticRonnie Sahlberg, Jul 23, 2014
  16. 14/15 refs.c: remove lock_any_ref_for_updateRonnie Sahlberg, Jul 23, 2014
  17. 15/15 refs.c: allow deleting refs with a broken sha1Ronnie Sahlberg, Jul 23, 2014
  18. Eric SunshineJul 23, 2014
  19. Junio C HamanoJul 23, 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.