Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-02-26 01:36:53 +0300
committerJunio C Hamano <junkio@cox.net>2007-03-04 11:24:15 +0300
commit5bd74506cd30e897d1493639b7438c6cc80dea8e (patch)
tree760231bfddbada6a4bf99a36749cd93b823ce775 /t/t5401-update-hooks.sh
parent0c725f1bd938fa2b626e910773e622a385daced2 (diff)
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/t5401-update-hooks.sh')
-rwxr-xr-xt/t5401-update-hooks.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh
index 0514056ca6..460c9fd7fe 100755
--- a/t/t5401-update-hooks.sh
+++ b/t/t5401-update-hooks.sh
@@ -51,12 +51,12 @@ test_expect_success 'hooks ran' '
test_expect_success 'update hook arguments' '
echo refs/heads/master $commit0 $commit1 |
- diff -u - victim/.git/update.args
+ git diff - victim/.git/update.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_failure 'update hook stdin is /dev/null' '