From: Jonathan Nieder <jrnieder@gmail.com>
To: Jonathan Tan <jonathantanmy@google.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH v2] fetch: no FETCH_HEAD display if --no-write-fetch-head
Date: Wed, 2 Sep 2020 16:56:28 -0700 [thread overview]
Message-ID: <20200902235628.GB4035286@google.com> (raw)
In-Reply-To: <20200902210539.1981453-1-jonathantanmy@google.com>
Jonathan Tan wrote:
> 887952b8c6 ("fetch: optionally allow disabling FETCH_HEAD update",
> 2020-08-18) introduced the ability to disable writing to FETCH_HEAD
> during fetch, but did not suppress the "<source> -> FETCH_HEAD" message
> when this ability is used. This message is misleading in this case,
> because FETCH_HEAD is not written. Also, because "fetch" is used to
> lazy-fetch missing objects in a partial clone, this significantly
> clutters up the output in that case since the objects to be fetched are
> potentially numerous.
>
> Therefore, suppress this message when --no-write-fetch-head is passed
> (but not when --dry-run is set).
>
> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
[...]
> 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/
> + * is set).
> + */
> format_display(¬e, '*',
> *kind ? kind : "branch", NULL,
> *what ? what : "HEAD",
> "FETCH_HEAD", summary_width);
> + }
> if (note.len) {
> if (verbosity >= 0 && !shown_url) {
> fprintf(stderr, _("From %.*s\n"),
> diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
> index d681e90640..584a039b85 100755
> --- a/t/t0410-partial-clone.sh
> +++ b/t/t0410-partial-clone.sh
> @@ -183,7 +183,7 @@ test_expect_success 'missing CLI object, but promised, passes fsck' '
> '
>
> test_expect_success 'fetching of missing objects' '
> - rm -rf repo &&
> + rm -rf repo err &&
> test_create_repo server &&
> test_commit -C server foo &&
> git -C server repack -a -d --write-bitmap-index &&
> @@ -194,7 +194,10 @@ test_expect_success 'fetching of missing objects' '
>
> git -C repo config core.repositoryformatversion 1 &&
> git -C repo config extensions.partialclone "origin" &&
> - git -C repo cat-file -p "$HASH" &&
> + git -C repo cat-file -p "$HASH" 2>err &&
> +
> + # Ensure that no spurious FETCH_HEAD messages are written
> + ! grep FETCH_HEAD err &&
This test feels very specific to the bug being addressed. That said,
since we *also* have a test below for the generic behavior I don't mind.
>
> # Ensure that the .promisor file is written, and check that its
> # associated packfile contains the object
> diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
> index 2a1abe91f0..759aec9305 100755
> --- a/t/t5510-fetch.sh
> +++ b/t/t5510-fetch.sh
> @@ -543,16 +543,18 @@ test_expect_success 'fetch into the current branch with --update-head-ok' '
>
> '
>
> -test_expect_success 'fetch --dry-run does not touch FETCH_HEAD' '
> - rm -f .git/FETCH_HEAD &&
> - git fetch --dry-run . &&
> - ! test -f .git/FETCH_HEAD
> +test_expect_success 'fetch --dry-run does not touch FETCH_HEAD, but still prints what would be written' '
> + rm -f .git/FETCH_HEAD err &&
> + git fetch --dry-run . 2>err &&
> + ! test -f .git/FETCH_HEAD &&
> + grep FETCH_HEAD err
> '
>
> -test_expect_success '--no-write-fetch-head does not touch FETCH_HEAD' '
> - rm -f .git/FETCH_HEAD &&
> - git fetch --no-write-fetch-head . &&
> - ! test -f .git/FETCH_HEAD
> +test_expect_success '--no-write-fetch-head does not touch FETCH_HEAD, and does not print what would be written' '
> + rm -f .git/FETCH_HEAD err &&
> + git fetch --no-write-fetch-head . 2>err &&
> + ! test -f .git/FETCH_HEAD &&
> + ! grep FETCH_HEAD err
Nice.
With or without the following squashed in,
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
diff --git i/builtin/fetch.c w/builtin/fetch.c
index c6c46892503..387eeb1ec08 100644
--- i/builtin/fetch.c
+++ w/builtin/fetch.c
@@ -1025,9 +1025,9 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
free(ref);
} else if (write_fetch_head || dry_run) {
/*
- * Display fetches written to FETCH_HEAD (or
- * would be written to FETCH_HEAD, if --dry-run
- * is set).
+ * Display fetches that wrote to FETCH_HEAD (or,
+ * if --dry-run is set, that would write to
+ * FETCH_HEAD).
*/
format_display(¬e, '*',
*kind ? kind : "branch", NULL,
next prev parent reply other threads:[~2020-09-02 23:56 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 [this message]
2020-09-03 2:03 ` Junio C Hamano
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=20200902235628.GB4035286@google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@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.
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).