Re: [PATCH] fetch: document that pruning happens before fetching

From: Duy Nguyen <pclouds@gmail.com>
Date: Jun 14, 2016, 09:36 UTC
Message-ID: <CACsJy8Ds_DnBLJ0jx7Pp9EH1coG-xAtri4w4hh__=nigCmBbdA@mail.gmail.com>
In-Reply-To: <20160613235850.GA8009@sigill.intra.peff.net>

On Tue, Jun 14, 2016 at 6:58 AM, Jeff King <peff@peff.net> wrote:

> This was changed in 10a6cc8 (fetch --prune: Run prune before
> fetching, 2014-01-02), but it seems that nobody in that
> discussion realized we were advertising the "after"
> explicitly.

Ah... ok. Good to know it's moved up top on purpose because I almost tried to move it down :) It's irritating that current output looks like this

<delete ref> <delete ref> <delete ref> remote: <random progress lines> <update ref> <update ref> <update ref>

It probably looks better if we can move the <delete ref> part after "remote: ..." lines (iow still _after_ fetch, but _before_ ref updates), e.g.

remote: <random progress lines> <delete ref> <delete ref> <delete ref> <update ref> <update ref> <update ref>

If we do so, there's no need to update document. But I don't know, maybe it's not worth doing.

Show 26 quoted lines

> Signed-off-by: Jeff King <peff@peff.net>
> ---
> I include myself in that "nobody" of course. :)
>
>  Documentation/fetch-options.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
> index 036edfb..b05a834 100644
> --- a/Documentation/fetch-options.txt
> +++ b/Documentation/fetch-options.txt
> @@ -52,7 +52,7 @@ ifndef::git-pull[]
>
>  -p::
>  --prune::
> -       After fetching, remove any remote-tracking references that no
> +       Before fetching, remove any remote-tracking references that no
>         longer exist on the remote.  Tags are not subject to pruning
>         if they are fetched only because of the default tag
>         auto-following or due to a --tags option.  However, if tags
> --
> 2.9.0.150.g8bd4cf6
> --
> 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

-- 
Duy