diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-20 02:00:36 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-20 05:33:07 (GMT) |
| commit | 57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c (patch) | |
| tree | 8f12e1e6f5bf259b5118dc8cd4a22b23d6c9f32b /t | |
| parent | dc26bd890d0a8571c38397e2ab33c0f3963c01a7 (diff) | |
| download | git-57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c.zip git-57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c.tar.gz git-57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c.tar.bz2 | |
[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-x | t/t0000-basic.sh | 2 | ||||
| -rw-r--r-- | t/t2002-checkout-cache-u.sh | 2 | ||||
| -rw-r--r-- | t/t4001-diff-rename.sh | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 7ae9d65..9a55712 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 8c789d8..69146ac 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 44225f7..065ddb7 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 |