aboutsummaryrefslogtreecommitdiff
path: root/t/t6200-fmt-merge-msg.sh
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-02-25 23:36:53 +0100
committerJunio C Hamano <junkio@cox.net>2007-03-04 00:24:15 -0800
commit5bd74506cd30e897d1493639b7438c6cc80dea8e (patch)
tree760231bfddbada6a4bf99a36749cd93b823ce775 /t/t6200-fmt-merge-msg.sh
parent0c725f1bd938fa2b626e910773e622a385daced2 (diff)
downloadgit-5bd74506cd30e897d1493639b7438c6cc80dea8e.tar.gz
git-5bd74506cd30e897d1493639b7438c6cc80dea8e.tar.xz
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/t6200-fmt-merge-msg.sh')
-rwxr-xr-xt/t6200-fmt-merge-msg.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index ea1402361..526d7d1c4 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -79,7 +79,7 @@ test_expect_success 'merge-msg test #1' '
git fetch . left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
- diff -u actual expected
+ git diff actual expected
'
cat >expected <<\EOF
@@ -92,7 +92,7 @@ test_expect_success 'merge-msg test #2' '
git fetch ../trash left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
- diff -u actual expected
+ git diff actual expected
'
cat >expected <<\EOF
@@ -115,7 +115,7 @@ test_expect_success 'merge-msg test #3' '
git fetch . left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
- diff -u actual expected
+ git diff actual expected
'
cat >expected <<\EOF
@@ -145,7 +145,7 @@ test_expect_success 'merge-msg test #4' '
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
- diff -u actual expected
+ git diff actual expected
'
test_expect_success 'merge-msg test #5' '
@@ -157,7 +157,7 @@ test_expect_success 'merge-msg test #5' '
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
- diff -u actual expected
+ git diff actual expected
'
test_done