From: Junio C Hamano <gitster@pobox.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: Stefan Beller <sbeller@google.com>, Jeff King <peff@peff.net>,
git@vger.kernel.org
Subject: Re: [PATCH v2 06/12] prune_remote(): use delete_refs()
Date: Mon, 15 Jun 2015 11:35:28 -0700 [thread overview]
Message-ID: <xmqq381sakgf.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <aab9d191609b34fbfee0b68883a5b14fba2421ad.1434206062.git.mhagger@alum.mit.edu> (Michael Haggerty's message of "Sat, 13 Jun 2015 16:42:09 +0200")
Michael Haggerty <mhagger@alum.mit.edu> writes:
> This will result in errors being emitted for references that can't be
> deleted, but that is a good thing.
>
> 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/"));
The resulting code reads better by making the for-each-string-list-item
loop only about reporting and not actually doing anything.
But the log message puzzles me. Didn't refs that cannot be deleted
cause the original to fail? After repacking without these refs, it
called delete-ref, and a failure to delete or commit the deletion
would have hit the error() down there, no?
next prev parent reply other threads:[~2015-06-15 18:35 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-13 14:42 [PATCH v2 00/12] Improve "refs" module encapsulation Michael Haggerty
2015-06-13 14:42 ` [PATCH v2 01/12] delete_ref(): move declaration to refs.h Michael Haggerty
2015-06-13 14:42 ` [PATCH v2 02/12] remove_branches(): remove temporary Michael Haggerty
2015-06-13 14:42 ` [PATCH v2 03/12] delete_ref(): handle special case more explicitly Michael Haggerty
2015-06-15 18:22 ` Junio C Hamano
2015-06-13 14:42 ` [PATCH v2 04/12] delete_refs(): new function for the refs API Michael Haggerty
2015-06-13 14:42 ` [PATCH v2 05/12] delete_refs(): improve error message Michael Haggerty
2015-06-15 18:29 ` Junio C Hamano
2015-06-19 14:20 ` Michael Haggerty
2015-06-13 14:42 ` [PATCH v2 06/12] prune_remote(): use delete_refs() Michael Haggerty
2015-06-15 18:35 ` Junio C Hamano [this message]
2015-06-15 18:39 ` Jeff King
2015-06-15 19:45 ` Junio C Hamano
2015-06-13 14:42 ` [PATCH v2 07/12] repack_without_refs(): make function private Michael Haggerty
2015-06-13 14:42 ` [PATCH v2 08/12] initial_ref_transaction_commit(): function for initial ref creation Michael Haggerty
2015-06-15 18:04 ` Junio C Hamano
2015-06-15 18:39 ` Junio C Hamano
2015-06-15 18:57 ` Jeff King
2015-06-15 18:53 ` Junio C Hamano
2015-06-20 2:15 ` Michael Haggerty
2015-06-13 14:42 ` [PATCH v2 09/12] refs: remove some functions from the module's public interface Michael Haggerty
2015-06-13 14:42 ` [PATCH v2 10/12] initial_ref_transaction_commit(): check for duplicate refs Michael Haggerty
2015-06-13 14:42 ` [PATCH v2 11/12] initial_ref_transaction_commit(): check for ref D/F conflicts Michael Haggerty
2015-06-13 14:42 ` [PATCH v2 12/12] refs: move the remaining ref module declarations to refs.h Michael Haggerty
2015-06-15 18:13 ` Junio C Hamano
2015-06-15 18:35 ` Jeff King
2015-06-15 19:48 ` Junio C Hamano
2015-06-20 1:53 ` Michael Haggerty
2015-06-20 3:30 ` Junio C Hamano
2015-06-15 5:20 ` [PATCH v2 00/12] Improve "refs" module encapsulation Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq381sakgf.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.