diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:19 -0700 |
| commit | 3e06e74e4cc221d0b602622a5a8d472cfa3efa2d (patch) | |
| tree | 1d22e6e40d9c6d8daddcf4c1a9e19a46255bfde4 /t/t5541-http-push-smart.sh | |
| parent | Merge branch 'ms/submodule-foreach-fix' into maint (diff) | |
| parent | progress: use term_clear_line() (diff) | |
| download | tgif-3e06e74e4cc221d0b602622a5a8d472cfa3efa2d.tar.xz | |
Merge branch 'sg/rebase-progress' into maint
Use "Erase in Line" CSI sequence that is already used in the editor
support to clear cruft in the progress output.
* sg/rebase-progress:
progress: use term_clear_line()
rebase: fix garbled progress display with '-x'
pager: add a helper function to clear the last line in the terminal
t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused
t3404: modernize here doc style
Diffstat (limited to 't/t5541-http-push-smart.sh')
| -rwxr-xr-x | t/t5541-http-push-smart.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh index 92bac43257..b86ddb60f2 100755 --- a/t/t5541-http-push-smart.sh +++ b/t/t5541-http-push-smart.sh @@ -262,7 +262,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 ' test_expect_success TTY 'push --quiet silences status and progress' ' @@ -277,7 +277,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' ' @@ -285,7 +285,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' ' |