Jonathan Nieder [off-list ref] writes:
The tests assume a reasonably well-behaved “diff -u” and “pr”
to produce the (possibly whitespace-damaged) patches. On platforms
without those commands, skip the tests.
pr -T is not portable. What's wrong with expand?
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Andreas Schwab wrote:
pr -T is not portable. What's wrong with expand?
Nothing at all. Here’s a patch for squashing in.
-- 8< --
Subject: t4135 (apply): use expand instead of pr for portability
expand is just the thing for expanding tabs into spaces, and
unlike pr -T, it is portable. Use it.
Noticed-by: Andreas Schwab [off-list ref]
Signed-off-by: Jonathan Nieder <redacted>
---
Thank you. :)
t/t4135-apply-weird-filenames.sh | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git i/t/t4135-apply-weird-filenames.sh w/t/t4135-apply-weird-filenames.sh
index 2dcb040..dda554e 100755
--- i/t/t4135-apply-weird-filenames.sh
+++ w/t/t4135-apply-weird-filenames.sh
@@ -34,15 +34,6 @@ test_expect_success 'setup: test prerequisites' '
if diff -pruN 1 2
then
test_set_prereq FULLDIFF
- fi &&
-
- echo "tab -> ." >expected &&
- echo "tab -> ." >with-tab &&
-
- pr -tT -e8 with-tab >actual &&
- if test_cmp expected actual
- then
- test_set_prereq PR
fi
'
@@ -99,16 +90,12 @@ try_filename 'with tab' 'post image.txt' success failure failure
try_filename 'with backslash' 'post\image.txt'
try_filename 'with quote' '"postimage".txt' success failure success
-if test_have_prereq FULLDIFF && test_have_prereq PR
-then
- test_set_prereq FULLDIFFPR
-fi
-test_expect_success FULLDIFFPR 'whitespace-damaged traditional patch' '
+test_expect_success FULLDIFF 'whitespace-damaged traditional patch' '
reset_preimage &&
reset_subdirs &&
echo postimage >b/postimage.txt &&
! diff -pruN a b >diff-plain.txt &&
- pr -tT -e8 diff-plain.txt >damaged.diff &&
+ expand diff-plain.txt >damaged.diff &&
mv postimage.txt postimage.saved &&
git apply -v damaged.diff &&
--