diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-23 14:55:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-23 16:23:10 -0700 |
| commit | b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298 (patch) | |
| tree | 8c15995be05c108072397d41d0454d6737509f7b /diff.h | |
| parent | a4acb0eb140d80141ac564a09219a10c3ab76449 (diff) | |
| download | git-b6d8f309d9bbd8193d9b73eb41c6fcdaa8001298.tar.gz | |
[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>
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -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 */ |