From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Jonathan Tan <jonathantanmy@google.com>, git@vger.kernel.org
Subject: Re: [PATCH v2] fetch: no FETCH_HEAD display if --no-write-fetch-head
Date: Wed, 02 Sep 2020 19:03:31 -0700 [thread overview]
Message-ID: <xmqqo8mnaa6k.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200902235628.GB4035286@google.com> (Jonathan Nieder's message of "Wed, 2 Sep 2020 16:56:28 -0700")
Jonathan Nieder <jrnieder@gmail.com> writes:
>> builtin/fetch.c | 8 +++++++-
>> t/t0410-partial-clone.sh | 7 +++++--
>> t/t5510-fetch.sh | 18 ++++++++++--------
>> 3 files changed, 22 insertions(+), 11 deletions(-)
>
> Thanks for fixing it, and sorry I didn't catch it during initial
> review.
> ...
>> diff --git a/builtin/fetch.c b/builtin/fetch.c
>> index 320ba9471d..c6c4689250 100644
>> --- a/builtin/fetch.c
>> +++ b/builtin/fetch.c
>> @@ -1023,11 +1023,17 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
>> rc |= update_local_ref(ref, what, rm, ¬e,
>> summary_width);
>> free(ref);
>> - } else
>> + } else if (write_fetch_head || dry_run) {
>> + /*
>> + * Display fetches written to FETCH_HEAD (or
>> + * would be written to FETCH_HEAD, if --dry-run
>
> nit: to fix the parallel construction, s/would/that would/ or
> s/written/that were written/
True.
>> + * is set).
>> + */
>> format_display(¬e, '*',
>> *kind ? kind : "branch", NULL,
>> *what ? what : "HEAD",
>> "FETCH_HEAD", summary_width);
>> + }
Strictly speaking, I suspect that this is still broken when the user
says "fetch --no-write-fetch-head --dry-run" in which case we should
skip this block.
And to fix it properly, we would probably need to keep track of
three things semi-independently.
- were we told this is a "dry-run"? (current 'dry_run' variable)
- were we told not to store fetch-head? (missing)
- after all, are we going to write or not write fetch-head (current
'write_fetch_head' variable)
And the conditional to protect this block would be fixed to use only
the second and new "have we seen --no-fetch-head on the command
line?" variable, and ignore the settings of the dry_run variable, I
think.
Thanks.
next prev parent reply other threads:[~2020-09-03 2:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 19:02 [PATCH] fetch: no FETCH_HEAD display if --no-write-fetch-head Jonathan Tan
2020-09-02 20:07 ` Junio C Hamano
2020-09-02 21:05 ` [PATCH v2] " Jonathan Tan
2020-09-02 21:27 ` Junio C Hamano
2020-09-02 23:56 ` Jonathan Nieder
2020-09-03 2:03 ` Junio C Hamano [this message]
2020-09-03 19:41 ` [PATCH v3] " Jonathan Tan
2020-09-03 21:00 ` Junio C Hamano
2020-09-03 21:06 ` Jonathan Tan
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqo8mnaa6k.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).