Redo "add test_cmp function for test scripts"
We had a handful test updates since we accepted 82ebb0b (add test_cmp function for test scripts). This fixes them up. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Mar 15, 2008 at 01:23 UTC
1f9ff0de82f0f2990f3d6f06dad1d381158c2a75
2 files changed
+2
-2
t/t4201-shortlog.sh
+1
-1
@@ -50,6 +50,6 @@ test_expect_success 'shortlog wrapping' 'test_cmp expect out'
50
git log HEAD > log
51
GIT_DIR=non-existing git shortlog -w < log > out
52
53
-test_expect_success 'shortlog from non-git directory' 'diff -u expect out'
53
+test_expect_success 'shortlog from non-git directory' 'test_cmp expect out'
54
55
test_done
t/t6031-merge-recursive.sh
+1
-1
@@ -42,7 +42,7 @@ test_expect_success 'mode change in both branches: expect conflict' '
42
echo "100755 $H 2 file2"
43
echo "100644 $H 3 file2"
44
) >expect &&
45
- diff -u actual expect &&
45
+ test_cmp actual expect &&
46
test -x file2
47
'
48