diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-11 08:26:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-11 08:26:33 +0100 |
| commit | cf6981d4932007555689052cbc255b911674b01c (patch) | |
| tree | 780cfe523171d98ecded8e4d8509db507707e1f3 /t/t5401-update-hooks.sh | |
| parent | Merge branch 'jc/fsck' (diff) | |
| parent | Get rid of the dependency to GNU diff in the tests (diff) | |
| download | git-cf6981d4932007555689052cbc255b911674b01c.tar.xz git-cf6981d4932007555689052cbc255b911674b01c.zip | |
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/t5401-update-hooks.sh')
| -rwxr-xr-x | t/t5401-update-hooks.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh index 0c0034e34c..cf6306ce9f 100755 --- a/t/t5401-update-hooks.sh +++ b/t/t5401-update-hooks.sh @@ -84,23 +84,23 @@ test_expect_success 'pre-receive hook arguments' ' echo \ refs/heads/master $commit0 $commit1 \ refs/heads/tofail $commit1 $commit0 \ - | diff - victim/.git/pre-receive.args + | git diff - victim/.git/pre-receive.args ' test_expect_success 'update hook arguments' ' (echo refs/heads/master $commit0 $commit1; echo refs/heads/tofail $commit1 $commit0 - ) | diff - victim/.git/update.args + ) | git diff - victim/.git/update.args ' test_expect_success 'post-receive hook arguments' ' echo refs/heads/master $commit0 $commit1 | - diff - victim/.git/post-receive.args + git diff - victim/.git/post-receive.args ' test_expect_success 'post-update hook arguments' ' echo refs/heads/master | - diff -u - victim/.git/post-update.args + git diff - victim/.git/post-update.args ' test_expect_success 'all hook stdin is /dev/null' ' @@ -128,7 +128,7 @@ STDERR post-update EOF test_expect_success 'send-pack stderr contains hook messages' ' egrep ^STD send.err >actual && - diff - actual <expect + git diff - actual <expect ' test_done |