Repace diff with test_cmp in several tests

Several `diff` invocations are replaced with `test_cmp`, which has the
advantage of showing any differences in the test log when the comparison
fails.

Signed-off-by: Peter Grayson <[email protected]>

Author: jpgrayson

t/t0006-patches.sh

@@ -42,7 +42,7 @@ EOF
 test_expect_success 'Modifications and no file args' '
     echo "six" >> even.txt &&
     stg patches > mod-no-files.log &&
-    diff -u mod-no-files.log expected-evens.log &&
+    test_cmp mod-no-files.log expected-evens.log &&
     git checkout even.txt
 '
 
@@ -57,16 +57,16 @@ test_expect_success 'Patches relative to dir' '
     (
         cd dir0 &&
         stg patches dir1/odd.txt > relative-odd.log &&
-        diff -u relative-odd.log ../expected-odds.log &&
+        test_cmp relative-odd.log ../expected-odds.log &&
         echo "seven" > dir1/odd.txt &&
         stg patches > relative-odd-mod.log &&
-        diff -u relative-odd-mod.log ../expected-odds.log &&
+        test_cmp relative-odd-mod.log ../expected-odds.log &&
         stg patches ../even.txt > relative-even.log &&
-        diff -u relative-even.log ../expected-evens.log &&
+        test_cmp relative-even.log ../expected-evens.log &&
         git checkout dir1/odd.txt &&
         echo "six" >> ../even.txt &&
         stg patches > relative-even-mod.log &&
-        diff -u relative-even-mod.log ../expected-evens.log &&
+        test_cmp relative-even-mod.log ../expected-evens.log &&
         git checkout ../even.txt
     )
 '

t/t0007-files.sh

@@ -39,9 +39,9 @@ EOF
 
 test_expect_success 'No patch args' '
     stg files > b-c.log &&
-    diff -u b-c.log expected-b-c.log &&
+    test_cmp b-c.log expected-b-c.log &&
     stg files -- patch-b-c > b-c2.log &&
-    diff -u b-c.log b-c2.log
+    test_cmp b-c.log b-c2.log
 '
 
 cat > expected-a-b-bare.log <<EOF
@@ -51,7 +51,7 @@ EOF
 
 test_expect_success 'Bare file names' '
     stg files --bare patch-a-b > a-b-bare.log &&
-    diff -u a-b-bare.log expected-a-b-bare.log
+    test_cmp a-b-bare.log expected-a-b-bare.log
 '
 
 cat > expected-b-c-stat.log <<EOF
@@ -63,7 +63,7 @@ EOF
 
 test_expect_success 'Stat output' '
     stg files --stat patch-b-c > b-c-stat.log &&
-    diff -u b-c-stat.log expected-b-c-stat.log
+    test_cmp b-c-stat.log expected-b-c-stat.log
 '
 
 test_expect_success 'Empty patch' '
@@ -81,7 +81,7 @@ test_expect_success 'Moved file' '
     git mv a.txt d.txt &&
     stg refresh &&
     stg files > a-d.log &&
-    diff -u a-d.log expected-a-d.log
+    test_cmp a-d.log expected-a-d.log
 '
 
 cat > expected-a-d-bare.log <<EOF
@@ -91,7 +91,7 @@ EOF
 
 test_expect_success 'Moved file bare' '
     stg files --bare -- patch-a-d > a-d-bare.log &&
-    diff -u a-d-bare.log expected-a-d-bare.log
+    test_cmp a-d-bare.log expected-a-d-bare.log
 '
 
 test_done

t/t2400-diff.sh

@@ -30,7 +30,7 @@ EOF
 
 test_expect_success 'Diff stat with some local changes' '
     stg diff --stat > add-foo-stat.diff &&
-    diff -u add-foo-stat.diff expected-add-foo-stat.diff
+    test_cmp add-foo-stat.diff expected-add-foo-stat.diff
 '
 
 test_expect_success 'Diff with bad diff-opts' '
@@ -44,7 +44,7 @@ test_expect_success 'Initialize StGit stuff' '
 
 test_expect_success 'Diff with some local changes' '
     stg diff > add-foo2.diff &&
-    diff -u add-foo.diff add-foo2.diff
+    test_cmp add-foo.diff add-foo2.diff
 '
 
 test_expect_success 'Refresh patch' '
@@ -77,9 +77,9 @@ test_expect_success 'Add more patches' '
 
 test_expect_success 'Diff revs parent-child' '
     stg diff -r foo..bar > foo-bar.diff &&
-    diff -u foo-bar.diff bar.diff &&
+    test_cmp foo-bar.diff bar.diff &&
     stg diff -r foo..bar --stat > foo-bar-stat.diff &&
-    diff -u foo-bar-stat.diff bar-stat.diff
+    test_cmp foo-bar-stat.diff bar-stat.diff
 '
 
 test_expect_success 'Diff invalid rev patch name' '
@@ -108,11 +108,11 @@ EOF
 test_expect_success 'Diff range just rev1' '
     stg diff -r bar.. > bar-head.diff &&
     stg diff -r bar.. --stat > bar-head-stat.diff &&
-    diff -u bar-head-stat.diff expected-bar-head-stat.diff &&
+    test_cmp bar-head-stat.diff expected-bar-head-stat.diff &&
     stg diff -r bar..p4 > bar-p4.diff &&
-    diff -u bar-head.diff bar-p4.diff &&
+    test_cmp bar-head.diff bar-p4.diff &&
     stg diff -r bar > bar-only.diff &&
-    diff -u bar-head.diff bar-only.diff
+    test_cmp bar-head.diff bar-only.diff
 '
 
 test_expect_success 'Diff range with path' '
@@ -129,9 +129,9 @@ test_expect_success 'Diff from dir' '
     (
         cd dir0 &&
         stg diff > threes2.diff &&
-        diff -u ../threes.diff threes2.diff &&
+        test_cmp ../threes.diff threes2.diff &&
         stg diff ../bar.txt > threes-bar2.diff &&
-        diff -u ../threes-bar.diff threes-bar2.diff &&
+        test_cmp ../threes-bar.diff threes-bar2.diff &&
         test -z "$(stg diff dir1/baz.txt)"
     )
 '
@@ -161,7 +161,7 @@ EOF
 
 test_expect_success 'Binary diff stat' '
     stg diff --stat > num-stat.diff &&
-    diff -u num-stat.diff expected-num-stat.diff
+    test_cmp num-stat.diff expected-num-stat.diff
 '
 
 test_expect_success 'Refresh binary' '
@@ -171,12 +171,12 @@ test_expect_success 'Refresh binary' '
 
 test_expect_success 'Binary diff range' '
     stg diff -r p5..p6 > num2.diff &&
-    diff -u num.diff num2.diff
+    test_cmp num.diff num2.diff
 '
 
 test_expect_success 'Binary diff range with --binary' '
     stg diff -r p5..p6 --diff-opts=--binary > num-binary2.diff &&
-    diff -u num-binary.diff num-binary2.diff
+    test_cmp num-binary.diff num-binary2.diff
 '
 
 test_done

t/t3200-non-ascii-filenames.sh

@@ -42,7 +42,7 @@ cat > expected.txt <<EOF
 EOF
 test_expect_success 'Status of modified non-ASCII file' '
     stg status > output.txt &&
-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt
 '
 
 test_expect_success 'Refresh changes to non-ASCII file' '
@@ -53,7 +53,7 @@ cat > expected.txt <<EOF
 EOF
 test_expect_success 'Status after refresh' '
     stg status > output.txt &&
-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt
 '
 
 test_done