Re: [PATCH 07/13] prune_remote(): use delete_refs()

From: Stefan Beller <sbeller@google.com>
Date: Jun 8, 2015, 16:57 UTC
Message-ID: <CAGZ79kYcO95M6DsPa71uckOcOKs-mkz2P+NtEKx5qYfOcDw99g@mail.gmail.com>
In-Reply-To: <2ce5b2c64d002ce649c2192bacdf505c4921caa6.1433763494.git.mhagger@alum.mit.edu>

On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty <mhagger@alum.mit.edu> wrote:

> This will result in errors being emitted for references that can't be
> deleted, but that is a good thing.

This sounds a bit like hand-waving to me. "Trust me, I'm an engineer!".

Show 35 quoted lines

>
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
> ---
>  builtin/remote.c | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/builtin/remote.c b/builtin/remote.c
> index c8dc724..cc3c741 100644
> --- a/builtin/remote.c
> +++ b/builtin/remote.c
> @@ -1314,19 +1314,12 @@ static int prune_remote(const char *remote, int dry_run)
>                 string_list_append(&refs_to_prune, item->util);
>         string_list_sort(&refs_to_prune);
>
> -       if (!dry_run) {
> -               struct strbuf err = STRBUF_INIT;
> -               if (repack_without_refs(&refs_to_prune, &err))
> -                       result |= error("%s", err.buf);
> -               strbuf_release(&err);
> -       }
> +       if (!dry_run)
> +               result |= delete_refs(&refs_to_prune);
>
>         for_each_string_list_item(item, &states.stale) {
>                 const char *refname = item->util;
>
> -               if (!dry_run)
> -                       result |= delete_ref(refname, NULL, 0);
> -
>                 if (dry_run)
>                         printf_ln(_(" * [would prune] %s"),
>                                abbrev_ref(refname, "refs/remotes/"));
> --
> 2.1.4
>