diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-02-25 23:36:53 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-04 00:24:15 -0800 |
| commit | 5bd74506cd30e897d1493639b7438c6cc80dea8e (patch) | |
| tree | 760231bfddbada6a4bf99a36749cd93b823ce775 /t/t4013-diff-various.sh | |
| parent | 0c725f1bd938fa2b626e910773e622a385daced2 (diff) | |
| download | git-5bd74506cd30e897d1493639b7438c6cc80dea8e.tar.gz git-5bd74506cd30e897d1493639b7438c6cc80dea8e.tar.xz | |
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/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 3d85ceaae..9f54af5a1 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -111,7 +111,7 @@ do } >"$actual" && if test -f "$expect" then - diff -u "$expect" "$actual" && + git diff "$expect" "$actual" && rm -f "$actual" else # this is to help developing new tests. |