diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-02-25 22:36:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-04 08:24:15 (GMT) |
| commit | 5bd74506cd30e897d1493639b7438c6cc80dea8e (patch) | |
| tree | 760231bfddbada6a4bf99a36749cd93b823ce775 /t/t4104-apply-boundary.sh | |
| parent | 0c725f1bd938fa2b626e910773e622a385daced2 (diff) | |
| download | git-5bd74506cd30e897d1493639b7438c6cc80dea8e.zip git-5bd74506cd30e897d1493639b7438c6cc80dea8e.tar.gz git-5bd74506cd30e897d1493639b7438c6cc80dea8e.tar.bz2 | |
Get rid of the dependency to GNU diff in the tests
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)
Diffstat (limited to 't/t4104-apply-boundary.sh')
| -rwxr-xr-x | t/t4104-apply-boundary.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh index 2ff800c..a5fb3ea 100755 --- a/t/t4104-apply-boundary.sh +++ b/t/t4104-apply-boundary.sh @@ -90,7 +90,7 @@ do cat '"$kind-patch.$with"' (exit 1) } && - diff -u '"$kind"'-expect victim + git diff '"$kind"'-expect victim ' done done @@ -108,7 +108,7 @@ do cat '"$kind-ng.without"' (exit 1) } && - diff -u '"$kind"'-expect victim + git diff '"$kind"'-expect victim ' done |