summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-05-19 19:00:36 -0700
committerLibravatar Linus Torvalds <torvalds@ppc970.osdl.org>2005-05-19 22:33:07 -0700
commit57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c (patch)
tree8f12e1e6f5bf259b5118dc8cd4a22b23d6c9f32b /t
parentdiff-tree: add "--root" flag to show a root commit as a big creation event. (diff)
downloadtgif-57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c.tar.xz
[PATCH] diff overhaul
This cleans up the way calls are made into the diff core from diff-tree family and diff-helper. Earlier, these programs had "if (generating_patch)" sprinkled all over the place, but those ugliness are gone and handled uniformly from the diff core, even when not generating patch format. This also allowed diff-cache and diff-files to acquire -R (reverse) option to generate diff in reverse. Users of diff-tree can swap two trees easily so I did not add -R there. [ Linus' note: I'll add -R to "diff-tree" too, since a "commit diff" doesn't have another tree to switch around: the other tree is always the parent(s) of the commit ] Also -M<digits-as-mantissa> suggestion made by Linus has been implemented. Documentation updates are also included. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 't')
-rwxr-xr-xt/t0000-basic.sh2
-rw-r--r--t/t2002-checkout-cache-u.sh2
-rw-r--r--t/t4001-diff-rename.sh6
3 files changed, 9 insertions, 1 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 7ae9d658ce..9a557129d9 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -166,7 +166,7 @@ cat >expected <<\EOF
EOF
test_expect_success \
'validate git-diff-files output for a know cache/work tree state.' \
- 'git-diff-files >current && cmp -s current expected'
+ 'git-diff-files >current && diff >/dev/null -b current expected'
test_expect_success \
'git-update-cache --refresh should succeed.' \
diff --git a/t/t2002-checkout-cache-u.sh b/t/t2002-checkout-cache-u.sh
index 8c789d8243..69146acc3a 100644
--- a/t/t2002-checkout-cache-u.sh
+++ b/t/t2002-checkout-cache-u.sh
@@ -29,3 +29,5 @@ rm -f path0 &&
git-read-tree $t &&
git-checkout-cache -u -f -a &&
git-diff-files | diff - /dev/null'
+
+test_done
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 44225f7a7b..065ddb71a9 100644
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -58,3 +58,9 @@ rename new path1
Line 13
Line 14
EOF
+
+test_expect_success \
+ 'validate the output.' \
+ 'diff -I "rename similarity.*" >/dev/null current expected'
+
+test_done