From: "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: rynus@gmail.com, stolee@gmail.com,
Derrick Stolee <dstolee@microsoft.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/1] commit-graph: use start_delayed_progress()
Date: Tue, 05 Nov 2019 20:14:01 +0000 [thread overview]
Message-ID: <pull.450.v2.git.1572984842.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.450.git.1572969955.gitgitgadget@gmail.com>
Thanks, Ryenus, for reporting this problem.
Derrick Stolee (1):
commit-graph: use start_delayed_progress()
commit-graph.c | 2 +-
t/t5318-commit-graph.sh | 6 ------
t/t6500-gc.sh | 14 --------------
3 files changed, 1 insertion(+), 21 deletions(-)
base-commit: da72936f544fec5a335e66432610e4cef4430991
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-450%2Fderrickstolee%2Fcommit-graph-progress-fix-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-450/derrickstolee/commit-graph-progress-fix-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/450
Range-diff vs v1:
1: 174c05bf29 ! 1: 78bd6bc2c0 commit-graph: use start_delayed_progress()
@@ -11,6 +11,10 @@
previous step. But, this is showing up for all users no matter how few
commits are being added.
+ Now that we changed this method, very fast commands show no progess at
+ all. This means we need to stop testing for seeing these progress lines
+ in the test suite.
+
Reported-by: ryenus <ryenus@gmail.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
@@ -26,3 +30,45 @@
_("Computing commit graph generation numbers"),
ctx->commits.nr);
for (i = 0; i < ctx->commits.nr; i++) {
+
+ diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
+ --- a/t/t5318-commit-graph.sh
+ +++ b/t/t5318-commit-graph.sh
+@@
+ test_line_count = 0 err
+ '
+
+-test_expect_success 'commit-graph write force progress on for stderr' '
+- cd "$TRASH_DIRECTORY/full" &&
+- git commit-graph write --progress 2>err &&
+- test_file_not_empty err
+-'
+-
+ test_expect_success 'commit-graph write with the --no-progress option' '
+ cd "$TRASH_DIRECTORY/full" &&
+ git commit-graph write --no-progress 2>err &&
+
+ diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
+ --- a/t/t6500-gc.sh
+ +++ b/t/t6500-gc.sh
+@@
+ test_line_count = 2 new # There is one new pack and its .idx
+ '
+
+-test_expect_success 'gc --no-quiet' '
+- git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
+- test_must_be_empty stdout &&
+- test_line_count = 1 stderr &&
+- test_i18ngrep "Computing commit graph generation numbers" stderr
+-'
+-
+-test_expect_success TTY 'with TTY: gc --no-quiet' '
+- test_terminal git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
+- test_must_be_empty stdout &&
+- test_i18ngrep "Enumerating objects" stderr &&
+- test_i18ngrep "Computing commit graph generation numbers" stderr
+-'
+-
+ test_expect_success 'gc --quiet' '
+ git -c gc.writeCommitGraph=true gc --quiet >stdout 2>stderr &&
+ test_must_be_empty stdout &&
--
gitgitgadget
next prev parent reply other threads:[~2019-11-05 20:14 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 16:05 [PATCH 0/1] commit-graph: use start_delayed_progress() Derrick Stolee via GitGitGadget
2019-11-05 16:05 ` [PATCH 1/1] " Derrick Stolee via GitGitGadget
2019-11-05 17:38 ` Derrick Stolee
2019-11-05 20:14 ` Derrick Stolee via GitGitGadget [this message]
2019-11-05 20:14 ` [PATCH v2 " Derrick Stolee via GitGitGadget
2019-11-06 4:09 ` Jeff King
2019-11-06 13:21 ` Derrick Stolee
2019-11-07 6:40 ` Jeff King
2019-11-07 13:30 ` Derrick Stolee
2019-11-07 4:37 ` Junio C Hamano
2019-11-07 6:43 ` Jeff King
2019-11-07 9:51 ` Junio C Hamano
2019-11-07 17:46 ` [PATCH v3 0/2] " Derrick Stolee via GitGitGadget
2019-11-07 17:46 ` [PATCH v3 1/2] progress: create GIT_PROGRESS_DELAY Derrick Stolee via GitGitGadget
2019-11-07 21:22 ` Jeff King
2019-11-11 14:27 ` SZEDER Gábor
2019-11-07 17:46 ` [PATCH v3 2/2] commit-graph: use start_delayed_progress() Derrick Stolee via GitGitGadget
2019-11-07 21:26 ` Jeff King
2019-11-21 23:03 ` SZEDER Gábor
2019-11-21 15:51 ` [PATCH v4 0/2] " Derrick Stolee via GitGitGadget
2019-11-21 15:51 ` [PATCH v4 1/2] progress: create GIT_PROGRESS_DELAY Derrick Stolee via GitGitGadget
2019-11-22 7:15 ` Jeff King
2019-11-21 15:51 ` [PATCH v4 2/2] commit-graph: use start_delayed_progress() Derrick Stolee via GitGitGadget
2019-11-22 7:17 ` Jeff King
2019-11-25 18:57 ` Derrick Stolee
2019-11-25 21:28 ` [PATCH v5 0/2] " Derrick Stolee via GitGitGadget
2019-11-25 21:28 ` [PATCH v5 1/2] progress: create GIT_PROGRESS_DELAY Derrick Stolee via GitGitGadget
2019-11-25 21:28 ` [PATCH v5 2/2] commit-graph: use start_delayed_progress() Derrick Stolee via GitGitGadget
2019-11-26 12:20 ` [PATCH v5 0/2] " Jeff King
2019-11-26 15:39 ` Derrick Stolee
2019-11-30 14:36 ` Junio C Hamano
2019-12-01 9:33 ` SZEDER Gábor
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=pull.450.v2.git.1572984842.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rynus@gmail.com \
--cc=stolee@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).