mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of the dependency to GNU diff in the tests

Browse Source 
Now that "git diff" handles stdin and relative paths outside the
working tree correctly, we can convert all instances of "diff -u"
to "git diff".

This commit is really the result of

$ perl -pi.bak -e 's/diff -u/git diff/' $(git grep -l "diff -u" t/)

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

(cherry picked from commit c699a40d68215c7e44a5b26117a35c8a56fbd387)
This commit is contained in:
Johannes Schindelin
2007-02-25 23:36:53 +01:00
committed by Junio C Hamano
parent 0c725f1bd9
commit 5bd74506cd
29 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t6024-recursive-merge.sh
View File

@ -70,7 +70,7 @@ G
>>>>>>> G:a1
EOF
test_expect_success "result contains a conflict" "diff -u expect a1"
test_expect_success "result contains a conflict" "git diff expect a1"
git ls-files --stage > out
cat > expect << EOF
@ -79,6 +79,6 @@ cat > expect << EOF
100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1
EOF
test_expect_success "virtual trees were processed" "diff -u expect out"
test_expect_success "virtual trees were processed" "git diff expect out"
test_done