Skip to content

Commit 860db91

Browse files
dschoGit for Windows Build Agent
authored andcommitted
t4124: avoid using "normal" diff mode
Everybody and their dogs, cats and other pets settled on using unified diffs. It is a really quaint holdover from a long-gone era that GNU diff outputs "normal" diff by default. Yet, t4124 relied on that mode. This mode is so out of fashion in the meantime, though, that e.g. BusyBox' diff decided not even to bother to support it. It only supports unified diffs. So let's just switch away from "normal" diffs and use unified diffs, as we really are only interested in the `+` lines. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 3c775cb commit 860db91

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t4124-apply-ws-rule.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ test_fix () {
4545
apply_patch --whitespace=fix || return 1
4646

4747
# find touched lines
48-
$DIFF file target | sed -n -e "s/^> //p" >fixed
48+
$DIFF -u file target | sed -n -e "3,\$s/^+//p" >fixed
4949

5050
# the changed lines are all expected to change
5151
fixed_cnt=$(wc -l <fixed)

0 commit comments

Comments
 (0)