diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-02-25 22:36:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-04 08:24:15 (GMT) |
| commit | 5bd74506cd30e897d1493639b7438c6cc80dea8e (patch) | |
| tree | 760231bfddbada6a4bf99a36749cd93b823ce775 /t/t6023-merge-file.sh | |
| parent | 0c725f1bd938fa2b626e910773e622a385daced2 (diff) | |
| download | git-5bd74506cd30e897d1493639b7438c6cc80dea8e.zip git-5bd74506cd30e897d1493639b7438c6cc80dea8e.tar.gz git-5bd74506cd30e897d1493639b7438c6cc80dea8e.tar.bz2 | |
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/t6023-merge-file.sh')
| -rw-r--r-- | t/t6023-merge-file.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index f3cd3db..c76fccf 100644 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -63,7 +63,7 @@ test_expect_success "merge without conflict (missing LF at EOF)" \ "git-merge-file test2.txt orig.txt new2.txt" test_expect_success "merge result added missing LF" \ - "diff -u test.txt test2.txt" + "git diff test.txt test2.txt" cp test.txt backup.txt test_expect_failure "merge with conflicts" \ @@ -86,7 +86,7 @@ non timebo mala, quoniam tu mecum es: virga tua et baculus tuus ipsa me consolata sunt. EOF -test_expect_success "expected conflict markers" "diff -u test.txt expect.txt" +test_expect_success "expected conflict markers" "git diff test.txt expect.txt" cp backup.txt test.txt test_expect_failure "merge with conflicts, using -L" \ @@ -110,7 +110,7 @@ virga tua et baculus tuus ipsa me consolata sunt. EOF test_expect_success "expected conflict markers, with -L" \ - "diff -u test.txt expect.txt" + "git diff test.txt expect.txt" sed "s/ tu / TU /" < new1.txt > new5.txt test_expect_failure "conflict in removed tail" \ @@ -132,7 +132,7 @@ virga tua et baculus tuus ipsa me consolata sunt. >>>>>>> new5.txt EOF -test_expect_success "expected conflict markers" "diff -u expect out" +test_expect_success "expected conflict markers" "git diff expect out" test_done |