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

committed by
Linus Torvalds

parent
38c6f78059
commit
81e50eabf0
12
diff.h
12
diff.h
@ -15,11 +15,21 @@ extern void diff_change(unsigned mode1, unsigned mode2,
|
||||
const unsigned char *sha2,
|
||||
const char *base, const char *path);
|
||||
|
||||
extern void diff_guif(unsigned mode1,
|
||||
unsigned mode2,
|
||||
const unsigned char *sha1,
|
||||
const unsigned char *sha2,
|
||||
const char *path1,
|
||||
const char *path2);
|
||||
|
||||
extern void diff_unmerge(const char *path);
|
||||
|
||||
extern int diff_scoreopt_parse(const char *opt);
|
||||
|
||||
extern void diff_setup(int reverse, int diff_raw_output);
|
||||
#define DIFF_FORMAT_HUMAN 0
|
||||
#define DIFF_FORMAT_MACHINE 1
|
||||
#define DIFF_FORMAT_PATCH 2
|
||||
extern void diff_setup(int reverse, int diff_output_style);
|
||||
|
||||
extern void diff_detect_rename(int, int);
|
||||
extern void diff_pickaxe(const char *);
|
||||
|
Reference in New Issue
Block a user