diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-23 18:14:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-23 19:17:06 -0700 |
| commit | bceafe752c03f4b13b9b1671a55d9e2acd26432d (patch) | |
| tree | 9036674db3bab78474a79b0445a8d8e178dc9151 /diffcore.h | |
| parent | 9a4a100eb46a769d1c5fa80c2daeb0b48a592d8d (diff) | |
| download | git-bceafe752c03f4b13b9b1671a55d9e2acd26432d.tar.gz git-bceafe752c03f4b13b9b1671a55d9e2acd26432d.tar.xz | |
[PATCH] Fix diff-pruning logic which was running prune too early.
For later stages to reorder patches, pruning logic and rename detection
logic should not decide which delete to discard (because another entry
said it will take over the file as a rename) until the very end.
Also fix some tests that were assuming the earlier "last one is rename
or keep everything else is copy" semantics of diff-raw format, which no
longer is true.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/diffcore.h b/diffcore.h index c709cddc4..1ffc78d01 100644 --- a/diffcore.h +++ b/diffcore.h @@ -12,8 +12,6 @@ #define DEFAULT_MINIMUM_SCORE 5000 #define RENAME_DST_MATCHED 01 -#define RENAME_SRC_GONE 02 -#define RENAME_SCORE_SHIFT 8 struct diff_filespec { unsigned char sha1[20]; |