Ronnie Sahlberg <sahlb...@google.com> writes:

> This should be merged into patch:
> 00c74db refs.c: add an err argument to repack_without_refs
>
> Signed-off-by: Ronnie Sahlberg <sahlb...@google.com>
> ---
>  builtin/remote.c | 5 +++--
>  refs.h           | 3 ++-
>  2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/remote.c b/builtin/remote.c
> index c9102e8..401feb3 100644
> --- a/builtin/remote.c
> +++ b/builtin/remote.c
> @@ -755,7 +755,7 @@ static int remove_branches(struct string_list *branches)
>       branch_names = xmalloc(branches->nr * sizeof(*branch_names));
>       for (i = 0; i < branches->nr; i++)
>               branch_names[i] = branches->items[i].string;
> -     result |= repack_without_refs(branch_names, branches->nr);
> +     result |= repack_without_refs(branch_names, branches->nr, NULL);
>       free(branch_names);
>  
>       for (i = 0; i < branches->nr; i++) {
> @@ -1333,7 +1333,8 @@ static int prune_remote(const char *remote, int dry_run)
>               for (i = 0; i < states.stale.nr; i++)
>                       delete_refs[i] = states.stale.items[i].util;
>               if (!dry_run)
> -                     result |= repack_without_refs(delete_refs, 
> states.stale.nr);
> +                     result |= repack_without_refs(delete_refs,
> +                                                   states.stale.nr, NULL);
>               free(delete_refs);
>       }
>  
> diff --git a/refs.h b/refs.h
> index 1b236f7..db463d0 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -162,7 +162,8 @@ extern void rollback_packed_refs(void);
>   */
>  int pack_refs(unsigned int flags);
>  
> -extern int repack_without_refs(const char **refnames, int n);
> +extern int repack_without_refs(const char **refnames, int n,
> +                            struct strbuf *err);
>  
>  extern int ref_exists(const char *);

How does this related to v16?  The reason I ask is because even
though v16 0/48 says it is to be applied on 'next' it won't at least
for me X-< and this is one of the early places where the patches
fail to apply without adjustment.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to