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/t3430-rebase-merges.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/t3430-rebase-merges.sh')
| -rwxr-xr-x | t/t3430-rebase-merges.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index cc627e34a7..84b2d0e664 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -507,9 +507,11 @@ test_expect_success 'octopus merges' ' git rebase -i --force-rebase -r HEAD^^ && test "Hank" = "$(git show -s --format=%an HEAD)" && test "$before" != $(git rev-parse HEAD) && - test_cmp_graph HEAD^^.. <<-\EOF + # NOTE: do not quote this heredoc, Dash 0.5.13 has a bug with heredocs + # that contain multibyte chars. + test_cmp_graph HEAD^^.. <<-EOF *-. Tüntenfüsch - |\ \ + |\\ \\ | | * three | * | two | |/ |