From c7f9b059cb012316799caefbfb5039d15f88afd2 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sat, 7 Nov 2026 08:21:32 +0100 Subject: [PATCH] test-tools: restore the two literal CR bytes 52c54b7 turned into newlines The context-pack CRLF fixture (sed 's/$/\r/') and the CR-stripped check (tr -d '\r') need a literal CR; an editor on Windows split each line at it. Byte-identical to db2b250 on both lines (Soul s3 finding crlf-fixture-stripped). Co-Authored-By: Claude Opus 5.5 --- tools/test-tools.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/test-tools.sh b/tools/test-tools.sh index f5fb2c7..33e3e2f 100644 --- a/tools/test-tools.sh +++ b/tools/test-tools.sh @@ -442,8 +442,7 @@ g() { git -C "$R" -c user.name=t -c user.email=t@t -c core.autocrlf=false "$@" > seqf() { local i; for i in $(seq 1 "$2"); do echo "$1$i"; done; } g init -q seqf a 40 >"$R/a.txt"; seqf b 40 >"$R/b.txt"; seqf c 10 >"$R/c.txt"; seqf d 20 >"$R/d.txt" -seqf e 10 >"$R/e.txt"; seqf f 20 >"$R/f.txt"; seqf g 300 >"$R/big.txt"; seqf h 5 | sed 's/$/ -/' >"$R/h.txt"; seqf m 40 >"$R/m.txt" +seqf e 10 >"$R/e.txt"; seqf f 20 >"$R/f.txt"; seqf g 300 >"$R/big.txt"; seqf h 5 | sed 's/$/ /' >"$R/h.txt"; seqf m 40 >"$R/m.txt" printf 's1\ns2\ns3\ns4\ndef needle_three\ns6\ns7 needle_many\ns8\nfoo::bar\ns10\n' >"$R/sym.txt" printf 'needle_three call 1\nneedle_three call 2\nneedle_three call 3\nneedle_threefold is another word\n' >"$R/zcallers.txt" echo 'bound_fifty bound_fiftyone spread_sym long_symbol q.zq sym_bad twenty_sym' >"$R/anchors.txt" @@ -493,8 +492,7 @@ cin "hunk ending just before the range shifts it" "[23] b.txt:4-5 MOVED(-2) -> cin "NEW file present in the worktree gets a window" "== [24] n.txt:1-2" cin "NEW window shows the file" " 2 n2" cin "CRLF window text" " 2 h2" -{ tr -d ' -' <"$T/cp.out" | cmp -s - "$T/cp.out"; } && echo "ok context-pack CRLF is stripped from windows" || { echo "FAIL context-pack CR in output"; fail=1; } +{ tr -d ' ' <"$T/cp.out" | cmp -s - "$T/cp.out"; } && echo "ok context-pack CRLF is stripped from windows" || { echo "FAIL context-pack CR in output"; fail=1; } cin "window numbers are worktree lines" " 6 b8" cin "window shows the edit" "b10-EDITED" cin "GONE window is labelled AT BASE" "== [7] c.txt:2-3 AT BASE"