diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-04-03 15:24:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-04-03 15:24:45 -0700 |
| commit | dc9afb66cf013dd8f80dfeffb595de1f27ef7a89 (patch) | |
| tree | 6207a41a61ca2a502bdb8f5423e2b59a45ddac2b /t/t9300-fast-import.sh | |
| parent | ac340a635dc8f338ee4ad6a6f74c974cdcda7217 (diff) | |
| parent | d48c5d5a4c801dfe9acd5dc4a3c1b94430883f52 (diff) | |
| download | git-dc9afb66cf013dd8f80dfeffb595de1f27ef7a89.tar.xz | |
Merge branch 'ps/dash-buggy-0.5.13-workaround'
The way dash 0.5.13 handles non-ASCII contents in here-doc
is buggy and breaks our existing tests, which unfortunately
have been rewritten to avoid triggering the bug.
* ps/dash-buggy-0.5.13-workaround:
t9300: work around partial read bug in Dash v0.5.13
t: work around multibyte bug in quoted heredocs with Dash v0.5.13
Diffstat (limited to 't/t9300-fast-import.sh')
| -rwxr-xr-x | t/t9300-fast-import.sh | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 5685cce6fe..479437760b 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -3635,25 +3635,21 @@ background_import_then_checkpoint () { echo "progress checkpoint" ) >&8 & - error=1 ;# assume the worst - while read output <&9 - do - if test "$output" = "progress checkpoint" - then - error=0 - break - elif test "$output" = "UNEXPECTED" - then - break - fi - # otherwise ignore cruft - echo >&2 "cruft: $output" - done + last=$( + while read output <&9 + do + if test "$output" = "progress checkpoint" || test "$output" = "UNEXPECTED" + then + echo "$output" + break + else + # otherwise ignore cruft + echo >&2 "cruft: $output" + fi + done + ) - if test $error -eq 1 - then - false - fi + test "$last" = "progress checkpoint" } background_import_still_running () { |