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/t5400-send-pack.sh | |
| parent | 8509fed75d576023f5f2db8542fad102fcc62d4d (diff) | |
| parent | 5bd74506cd30e897d1493639b7438c6cc80dea8e (diff) | |
| download | git-cf6981d4932007555689052cbc255b911674b01c.tar.gz | |
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/t5400-send-pack.sh')
| -rwxr-xr-x | t/t5400-send-pack.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh index b1c97b0dfb..477b267599 100755 --- a/t/t5400-send-pack.sh +++ b/t/t5400-send-pack.sh @@ -110,7 +110,7 @@ test_expect_success \ cd .. && git-update-ref refs/heads/master master^ || return 1 git-send-pack --force ./victim/.git/ master && return 1 - ! diff .git/refs/heads/master victim/.git/refs/heads/master + ! git diff .git/refs/heads/master victim/.git/refs/heads/master ' test_done |