aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-15 01:23:26 -0700
committerJunio C Hamano <gitster@pobox.com>2008-03-15 01:23:26 -0700
commit1f9ff0de82f0f2990f3d6f06dad1d381158c2a75 (patch)
treeb5d6a8057d5e8116df2b3d05779abf861bc42909
parent1f17868b303f762556034db81d02c55de2878e07 (diff)
downloadgit-1f9ff0de82f0f2990f3d6f06dad1d381158c2a75.tar.gz
git-1f9ff0de82f0f2990f3d6f06dad1d381158c2a75.tar.xz
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>
-rwxr-xr-xt/t4201-shortlog.sh2
-rwxr-xr-xt/t6031-merge-recursive.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index 672b28859..405b97119 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -50,6 +50,6 @@ test_expect_success 'shortlog wrapping' 'test_cmp expect out'
git log HEAD > log
GIT_DIR=non-existing git shortlog -w < log > out
-test_expect_success 'shortlog from non-git directory' 'diff -u expect out'
+test_expect_success 'shortlog from non-git directory' 'test_cmp expect out'
test_done
diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index 5bb6b9378..c8310aee4 100755
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@ -42,7 +42,7 @@ test_expect_success 'mode change in both branches: expect conflict' '
echo "100755 $H 2 file2"
echo "100644 $H 3 file2"
) >expect &&
- diff -u actual expect &&
+ test_cmp actual expect &&
test -x file2
'