File tree Expand file tree Collapse file tree 3 files changed +21
-1
lines changed Expand file tree Collapse file tree 3 files changed +21
-1
lines changed Original file line number Diff line number Diff line change @@ -1103,7 +1103,7 @@ static void compute_generation_numbers(struct write_commit_graph_context *ctx)
1103
1103
struct commit_list * list = NULL ;
1104
1104
1105
1105
if (ctx -> report_progress )
1106
- ctx -> progress = start_delayed_progress (
1106
+ ctx -> progress = start_progress (
1107
1107
_ ("Computing commit graph generation numbers" ),
1108
1108
ctx -> commits .nr );
1109
1109
for (i = 0 ; i < ctx -> commits .nr ; i ++ ) {
Original file line number Diff line number Diff line change @@ -130,6 +130,12 @@ test_expect_success 'commit-graph write progress off for redirected stderr' '
130
130
test_line_count = 0 err
131
131
'
132
132
133
+ test_expect_success ' commit-graph write force progress on for stderr' '
134
+ cd "$TRASH_DIRECTORY/full" &&
135
+ git commit-graph write --progress 2>err &&
136
+ test_file_not_empty err
137
+ '
138
+
133
139
test_expect_success ' commit-graph write with the --no-progress option' '
134
140
cd "$TRASH_DIRECTORY/full" &&
135
141
git commit-graph write --no-progress 2>err &&
Original file line number Diff line number Diff line change @@ -102,6 +102,20 @@ test_expect_success 'auto gc with too many loose objects does not attempt to cre
102
102
test_line_count = 2 new # There is one new pack and its .idx
103
103
'
104
104
105
+ test_expect_success ' gc --no-quiet' '
106
+ git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
107
+ test_must_be_empty stdout &&
108
+ test_line_count = 1 stderr &&
109
+ test_i18ngrep "Computing commit graph generation numbers" stderr
110
+ '
111
+
112
+ test_expect_success TTY ' with TTY: gc --no-quiet' '
113
+ test_terminal git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
114
+ test_must_be_empty stdout &&
115
+ test_i18ngrep "Enumerating objects" stderr &&
116
+ test_i18ngrep "Computing commit graph generation numbers" stderr
117
+ '
118
+
105
119
test_expect_success ' gc --quiet' '
106
120
git -c gc.writeCommitGraph=true gc --quiet >stdout 2>stderr &&
107
121
test_must_be_empty stdout &&
You can’t perform that action at this time.
0 commit comments