diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-10 23:26:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-10 23:26:33 -0800 |
| commit | cf6981d4932007555689052cbc255b911674b01c (patch) | |
| tree | 780cfe523171d98ecded8e4d8509db507707e1f3 /t/t3002-ls-files-dashpath.sh | |
| parent | 8509fed75d576023f5f2db8542fad102fcc62d4d (diff) | |
| parent | 5bd74506cd30e897d1493639b7438c6cc80dea8e (diff) | |
| download | git-cf6981d4932007555689052cbc255b911674b01c.tar.gz git-cf6981d4932007555689052cbc255b911674b01c.tar.xz | |
Merge branch 'js/diff-ni'
* js/diff-ni:
Get rid of the dependency to GNU diff in the tests
diff --no-index: support /dev/null as filename
diff-ni: fix the diff with standard input
diff: support reading a file from stdin via "-"
Diffstat (limited to 't/t3002-ls-files-dashpath.sh')
| -rwxr-xr-x | t/t3002-ls-files-dashpath.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t3002-ls-files-dashpath.sh b/t/t3002-ls-files-dashpath.sh index b42f1382b..cc8967d76 100755 --- a/t/t3002-ls-files-dashpath.sh +++ b/t/t3002-ls-files-dashpath.sh @@ -23,7 +23,7 @@ test_expect_success \ test_expect_success \ 'git-ls-files without path restriction.' \ 'git-ls-files --others >output && - diff -u output - <<EOF + git diff output - <<EOF -- -foo output @@ -34,7 +34,7 @@ EOF test_expect_success \ 'git-ls-files with path restriction.' \ 'git-ls-files --others path0 >output && - diff -u output - <<EOF + git diff output - <<EOF path0 EOF ' @@ -42,7 +42,7 @@ EOF test_expect_success \ 'git-ls-files with path restriction with --.' \ 'git-ls-files --others -- path0 >output && - diff -u output - <<EOF + git diff output - <<EOF path0 EOF ' @@ -50,7 +50,7 @@ EOF test_expect_success \ 'git-ls-files with path restriction with -- --.' \ 'git-ls-files --others -- -- >output && - diff -u output - <<EOF + git diff output - <<EOF -- EOF ' @@ -58,7 +58,7 @@ EOF test_expect_success \ 'git-ls-files with no path restriction.' \ 'git-ls-files --others -- >output && - diff -u output - <<EOF + git diff output - <<EOF -- -foo output |