From 81e50eabf06dd68e8e62a9b697eaf60904c58b22 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 21 May 2005 19:42:18 -0700 Subject: [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 Signed-off-by: Linus Torvalds --- diff.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'diff.h') diff --git a/diff.h b/diff.h index 7b9f37d1b8..1fc8469cfc 100644 --- a/diff.h +++ b/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 *); -- cgit v1.2.3