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

12
t/t4117-apply-reject.sh
View File

@ -54,7 +54,7 @@ test_expect_success 'apply without --reject should fail' '
exit 1
fi
diff -u file1 saved.file1
git diff file1 saved.file1
'
test_expect_success 'apply without --reject should fail' '
@ -65,7 +65,7 @@ test_expect_success 'apply without --reject should fail' '
exit 1
fi
diff -u file1 saved.file1
git diff file1 saved.file1
'
test_expect_success 'apply with --reject should fail but update the file' '
@ -79,7 +79,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
exit 1
fi
diff -u file1 expected &&
git diff file1 expected &&
cat file1.rej &&
@ -105,7 +105,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
echo "file1 still exists?"
exit 1
}
diff -u file2 expected &&
git diff file2 expected &&
cat file2.rej &&
@ -132,7 +132,7 @@ test_expect_success 'the same test with --verbose' '
echo "file1 still exists?"
exit 1
}
diff -u file2 expected &&
git diff file2 expected &&
cat file2.rej &&
@ -151,7 +151,7 @@ test_expect_success 'apply cleanly with --verbose' '
git apply --verbose patch.1 &&
diff -u file1 clean
git diff file1 clean
'
test_done