Hi, On Tue, 11 Jun 2019, SZEDER Gábor wrote:
> diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh > index 8ef8763e06..2e4802e206 100755 > --- a/t/t5541-http-push-smart.sh > +++ b/t/t5541-http-push-smart.sh > @@ -213,7 +213,7 @@ test_expect_success TTY 'push shows progress when stderr > is a tty' ' > cd "$ROOT_PATH"/test_repo_clone && > test_commit noisy && > test_terminal git push >output 2>&1 && > - test_i18ngrep "^Writing objects" output > + test_i18ngrep "Writing objects" output I guess the problem is that now the "Writing objects" is preceded by a CR instead of a NL? If so, maybe the `cr_to_nl` function could be introduced into `test-lib-functions.sh` and be used here and in the subsequent test cases? (Just an idea, as you seemed unhappy about these adjustments according to the cover letter.) Ciao, Dscho > ' > > test_expect_success TTY 'push --quiet silences status and progress' ' > @@ -228,7 +228,7 @@ test_expect_success TTY 'push --no-progress silences > progress but not status' ' > test_commit no-progress && > test_terminal git push --no-progress >output 2>&1 && > test_i18ngrep "^To http" output && > - test_i18ngrep ! "^Writing objects" output > + test_i18ngrep ! "Writing objects" output > ' > > test_expect_success 'push --progress shows progress to non-tty' ' > @@ -236,7 +236,7 @@ test_expect_success 'push --progress shows progress to > non-tty' ' > test_commit progress && > git push --progress >output 2>&1 && > test_i18ngrep "^To http" output && > - test_i18ngrep "^Writing objects" output > + test_i18ngrep "Writing objects" output > ' > > test_expect_success 'http push gives sane defaults to reflog' ' > -- > 2.22.0.566.g58873a45ff > >
