diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-21 19:42:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-21 22:49:19 -0700 |
| commit | 81e50eabf06dd68e8e62a9b697eaf60904c58b22 (patch) | |
| tree | f7cf8566f2a72a669b6e4bbaca0cf6ca5a781dd3 /t/t4003-diff-rename-1.sh | |
| parent | 38c6f78059c3060db6f94b24f4a90063a91090d2 (diff) | |
| download | git-81e50eabf06dd68e8e62a9b697eaf60904c58b22.tar.gz git-81e50eabf06dd68e8e62a9b697eaf60904c58b22.tar.xz | |
[PATCH] The diff-raw format updates.
Update the diff-raw format as Linus and I discussed, except that
it does not use sequence of underscore '_' letters to express
nonexistence. All '0' mode is used for that purpose instead.
The new diff-raw format can express rename/copy, and the earlier
restriction that -M and -C _must_ be used with the patch format
output is no longer necessary. The patch makes -M and -C flags
independent of -p flag, so you need to say git-whatchanged -M -p
to get the diff/patch format.
Updated are both documentations and tests.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 't/t4003-diff-rename-1.sh')
| -rw-r--r-- | t/t4003-diff-rename-1.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh index 3dde165e3..167d0b95b 100644 --- a/t/t4003-diff-rename-1.sh +++ b/t/t4003-diff-rename-1.sh @@ -26,7 +26,7 @@ test_expect_success \ # both are slightly edited. So we say you copy-and-edit one, # and rename-and-edit the other. -GIT_DIFF_OPTS=--unified=0 git-diff-cache -M $tree | +GIT_DIFF_OPTS=--unified=0 git-diff-cache -M -p $tree | sed -e 's/\([0-9][0-9]*\)/#/g' >current && cat >expected <<\EOF diff --git a/COPYING b/COPYING.# @@ -68,7 +68,7 @@ test_expect_success \ # both are slightly edited. So we say you edited one, # and copy-and-edit the other. -GIT_DIFF_OPTS=--unified=0 git-diff-cache -C $tree | +GIT_DIFF_OPTS=--unified=0 git-diff-cache -C -p $tree | sed -e 's/\([0-9][0-9]*\)/#/g' >current cat >expected <<\EOF diff --git a/COPYING b/COPYING.# @@ -108,7 +108,7 @@ test_expect_success \ # this is only possible because -C mode now reports the unmodified # file to the diff-core. -GIT_DIFF_OPTS=--unified=0 git-diff-cache -C $tree | +GIT_DIFF_OPTS=--unified=0 git-diff-cache -C -p $tree | sed -e 's/\([0-9][0-9]*\)/#/g' >current cat >expected <<\EOF diff --git a/COPYING b/COPYING.# |