Skip to content

Commit c0c2555

Browse files
derrickstoleedscho
authored andcommitted
Merge pull request #432: sequencer: avoid progress when stderr is redirected
During a run of the Scalar functional tests, we hit a case where the inexact rename detection of a 'git cherry-pick' command slowed to the point of writing its delayed progress, failing the test because stderr differed from the control case. Showing progress like this when stderr is not a terminal is non-standard for Git, so inject an isatty(2) when initializing the progress option in sequencer.c. Unfortunately, there is no '--quiet' option in 'git cherry-pick' currently wired up. This could be considered in the future, and the isatty(2) could be moved to that position. This would also be needed for commands like 'git rebase', so we leave that for another time.
2 parents 7b407f2 + d764e86 commit c0c2555

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sequencer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ static int do_recursive_merge(struct repository *r,
765765
o.branch2 = next ? next_label : "(empty tree)";
766766
if (is_rebase_i(opts))
767767
o.buffer_output = 2;
768-
o.show_rename_progress = 1;
768+
o.show_rename_progress = isatty(2);
769769

770770
head_tree = parse_tree_indirect(head);
771771
if (!head_tree)

0 commit comments

Comments
 (0)