Re: [PATCH v3 00/11] document & test fetch pruning & add fetch.pruneTags

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Jan 24, 2018, 23:25 UTC
Message-ID: <877es6yh40.fsf@evledraar.gmail.com>
In-Reply-To: <xmqqwp06amfw.fsf@gitster.mtv.corp.google.com>

On Wed, Jan 24 2018, Junio C. Hamano jotted:

Show 16 quoted lines

> Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:
>
>>  Documentation/config.txt               |  20 ++++-
>>  Documentation/fetch-options.txt        |  18 +++-
>>  Documentation/git-fetch.txt            |  76 +++++++++++++++++
>>  Documentation/git-remote.txt           |  14 +--
>>  builtin/fetch.c                        |  37 +++++++-
>>  contrib/completion/git-completion.bash |   2 +-
>>  remote.c                               |   5 +-
>>  remote.h                               |   3 +
>>  t/t5510-fetch.sh                       | 152 ++++++++++++++++++++++++---------
>>  9 files changed, 275 insertions(+), 52 deletions(-)
>
> I've queued this round but saw a few minor conflicts with another
> topi in flight, so please double check the result when I push the
> result out shortly.

Yikes. fetch.c is busy these days. Looked it over, looks good to me. In particular the potential logic error introduced by mis-merging "fetch: refactor calculation of remote list" has a test which would fail.