[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>
This commit is contained in:

committed by
Linus Torvalds

parent
a4acb0eb14
commit
b6d8f309d9
@ -47,6 +47,7 @@ struct diff_filepair {
|
||||
* certain ordering of patches that later
|
||||
* diffcore transformations should not break.
|
||||
*/
|
||||
int status; /* M C R N D U (see Documentation/diff-format.txt) */
|
||||
};
|
||||
#define DIFF_PAIR_UNMERGED(p) \
|
||||
(!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two))
|
||||
|
Reference in New Issue
Block a user