diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-23 21:55:33 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-23 23:23:10 (GMT) |
| commit | b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298 (patch) | |
| tree | 8c15995be05c108072397d41d0454d6737509f7b /t/t0000-basic.sh | |
| parent | a4acb0eb140d80141ac564a09219a10c3ab76449 (diff) | |
| download | git-b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298.zip git-b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298.tar.gz git-b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298.tar.bz2 | |
[PATCH] diff-raw format update take #2.
This changes the diff-raw format again, following the mailing
list discussion. The new format explicitly expresses which one
is a rename and which one is a copy.
The documentation and tests are updated to match this change.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 't/t0000-basic.sh')
| -rwxr-xr-x | t/t0000-basic.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 831fe95..88a9a00 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -155,14 +155,14 @@ test_expect_success \ test "$newtree" = "$tree"' cat >expected <<\EOF -:100644 100644 f87290f8eb2cbbea7857214459a0739927eab154 0000000000000000000000000000000000000000 path0 path0 -:120000 120000 15a98433ae33114b085f3eb3bb03b832b3180a01 0000000000000000000000000000000000000000 path0sym path0sym -:100644 100644 3feff949ed00a62d9f7af97c15cd8a30595e7ac7 0000000000000000000000000000000000000000 path2/file2 path2/file2 -:120000 120000 d8ce161addc5173867a3c3c730924388daedbc38 0000000000000000000000000000000000000000 path2/file2sym path2/file2sym -:100644 100644 0aa34cae68d0878578ad119c86ca2b5ed5b28376 0000000000000000000000000000000000000000 path3/file3 path3/file3 -:120000 120000 8599103969b43aff7e430efea79ca4636466794f 0000000000000000000000000000000000000000 path3/file3sym path3/file3sym -:100644 100644 00fb5908cb97c2564a9783c0c64087333b3b464f 0000000000000000000000000000000000000000 path3/subp3/file3 path3/subp3/file3 -:120000 120000 6649a1ebe9e9f1c553b66f5a6e74136a07ccc57c 0000000000000000000000000000000000000000 path3/subp3/file3sym path3/subp3/file3sym +:100644 100644 f87290f8eb2cbbea7857214459a0739927eab154 0000000000000000000000000000000000000000 M path0 +:120000 120000 15a98433ae33114b085f3eb3bb03b832b3180a01 0000000000000000000000000000000000000000 M path0sym +:100644 100644 3feff949ed00a62d9f7af97c15cd8a30595e7ac7 0000000000000000000000000000000000000000 M path2/file2 +:120000 120000 d8ce161addc5173867a3c3c730924388daedbc38 0000000000000000000000000000000000000000 M path2/file2sym +:100644 100644 0aa34cae68d0878578ad119c86ca2b5ed5b28376 0000000000000000000000000000000000000000 M path3/file3 +:120000 120000 8599103969b43aff7e430efea79ca4636466794f 0000000000000000000000000000000000000000 M path3/file3sym +:100644 100644 00fb5908cb97c2564a9783c0c64087333b3b464f 0000000000000000000000000000000000000000 M path3/subp3/file3 +:120000 120000 6649a1ebe9e9f1c553b66f5a6e74136a07ccc57c 0000000000000000000000000000000000000000 M path3/subp3/file3sym EOF test_expect_success \ 'validate git-diff-files output for a know cache/work tree state.' \ |