Re: [PATCH] t/: Replace diff [-u|-U0] with test_cmp to allow compilation with old diff
From: Brandon Casey <hidden>
Date: 2016-06-15 22:45:00
Subsystem:
the rest · Maintainer:
Linus Torvalds
Miklos Vajna wrote:
On Tue, Jul 22, 2008 at 04:17:43PM -0500, Brandon Casey [off-list ref] wrote:quoted
t/t0002-gitfile.sh | 2 +- t/t1002-read-tree-m-u-2way.sh | 12 ++++++------ t/t2201-add-update-typechange.sh | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-)Hmm, after applying this patch, I have: ~/git/t$ git grep 'diff -U' t1002-read-tree-m-u-2way.sh: diff -U0 M.out 4.out >4diff.out t1002-read-tree-m-u-2way.sh: diff -U0 M.out 5.out >5diff.out t1002-read-tree-m-u-2way.sh: diff -U0 M.out 14.out >14diff.out t1002-read-tree-m-u-2way.sh: diff -U0 M.out 15.out >15diff.out Any reason you left this out? ;-)
I have the patch below in my repo so I can run this test. (copy/pasted and white-space corrupted since I haven't figured out how to reply to a message and import a patch correctly using thunderbird). As you can see I just replaced the 'diff -U0' with 'git diff -U0' and then stripped off the git bits from the diff in the compare_change() function. I think there is probably a better way to fix this, so I left it out. Thinking about it now, it would have made sense to hold off on the part of the patch I submitted which applies to t1002-read-tree-m-u-2way.sh until I had a solution for the rest of these 'diff -U0's. -brandon
diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
index aa9dd58..5e40cec 100755
--- a/t/t1002-read-tree-m-u-2way.sh
+++ b/t/t1002-read-tree-m-u-2way.sh@@ -14,6 +14,8 @@ _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" compare_change () { sed >current \ + -e '1{/^diff --git /d;}' \ + -e '2{/^index /d;}' \ -e '/^--- /d; /^+++ /d; /^@@ /d;' \ -e 's/^\(.[0-7][0-7][0-7][0-7][0-7][0-7]\) '"$_x40"' /\1 X /' "$1" test_cmp expected current
@@ -75,7 +77,7 @@ test_expect_success \ git update-index --add yomin && git read-tree -m -u $treeH $treeM && git ls-files --stage >4.out || return 1 - diff -U0 M.out 4.out >4diff.out + git diff -U0 --no-index M.out 4.out >4diff.out compare_change 4diff.out expected && check_cache_at yomin clean && sum bozbar frotz nitfol >actual4.sum &&
@@ -94,7 +96,7 @@ test_expect_success \ echo yomin yomin >yomin && git read-tree -m -u $treeH $treeM && git ls-files --stage >5.out || return 1 - diff -U0 M.out 5.out >5diff.out + git diff -U0 --no-index M.out 5.out >5diff.out compare_change 5diff.out expected && check_cache_at yomin dirty && sum bozbar frotz nitfol >actual5.sum &&
@@ -206,7 +208,7 @@ test_expect_success \ git update-index --add nitfol && git read-tree -m -u $treeH $treeM && git ls-files --stage >14.out || return 1 - diff -U0 M.out 14.out >14diff.out + git diff -U0 --no-index M.out 14.out >14diff.out compare_change 14diff.out expected && sum bozbar frotz >actual14.sum && grep -v nitfol M.sum > expected14.sum &&
@@ -227,7 +229,7 @@ test_expect_success \ echo nitfol nitfol nitfol >nitfol && git read-tree -m -u $treeH $treeM && git ls-files --stage >15.out || return 1 - diff -U0 M.out 15.out >15diff.out + git diff -U0 --no-index M.out 15.out >15diff.out compare_change 15diff.out expected && check_cache_at nitfol dirty && sum bozbar frotz >actual15.sum &&
--
1.5.6.2