undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redo "add test_cmp function for test scripts"

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2008-03-15 01:23:26 -07:00
parent 1f17868b30
commit 1f9ff0de82
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t4201-shortlog.sh
View File

@ -50,6 +50,6 @@ test_expect_success 'shortlog wrapping' 'test_cmp expect out'
git log HEAD > log git log HEAD > log
GIT_DIR=non-existing git shortlog -w < log > out 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 test_done

2
t/t6031-merge-recursive.sh
View File

@ -42,7 +42,7 @@ test_expect_success 'mode change in both branches: expect conflict' '
echo "100755 $H 2 file2" echo "100755 $H 2 file2"
echo "100644 $H 3 file2" echo "100644 $H 3 file2"
) >expect && ) >expect &&
diff -u actual expect && test_cmp actual expect &&
test -x file2 test -x file2
' '