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/t4115-apply-symlink.sh | |
| parent | 0c725f1bd938fa2b626e910773e622a385daced2 (diff) | |
| download | git-5bd74506cd30e897d1493639b7438c6cc80dea8e.tar.gz | |
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/t4115-apply-symlink.sh')
| -rwxr-xr-x | t/t4115-apply-symlink.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh index d5f2cfb186..b947ed83bb 100755 --- a/t/t4115-apply-symlink.sh +++ b/t/t4115-apply-symlink.sh @@ -33,7 +33,7 @@ test_expect_success 'apply symlink patch' ' git checkout side && git apply patch && git diff-files -p >patched && - diff -u patch patched + git diff patch patched ' @@ -42,7 +42,7 @@ test_expect_success 'apply --index symlink patch' ' git checkout -f side && git apply --index patch && git diff-index --cached -p HEAD >patched && - diff -u patch patched + git diff patch patched ' |