From b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 23 May 2005 14:55:33 -0700 Subject: [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 Signed-off-by: Linus Torvalds --- diff.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'diff.h') diff --git a/diff.h b/diff.h index cae6e14fc5..6aa412869e 100644 --- a/diff.h +++ b/diff.h @@ -15,12 +15,14 @@ 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_helper_input(unsigned mode1, + unsigned mode2, + const unsigned char *sha1, + const unsigned char *sha2, + const char *path1, + int status, + int score, + const char *path2); extern void diff_unmerge(const char *path); @@ -44,6 +46,6 @@ extern void diffcore_pathspec(const char **pathspec); extern int diff_queue_is_empty(void); -extern void diff_flush(int output_style); +extern void diff_flush(int output_style, int resolve_rename_copy); #endif /* DIFF_H */ -- cgit v1.3