mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Clean up diff_setup() to make it more extensible.

Browse Source 
This changes the argument of diff_setup() from an integer that
says if we are feeding reversed diff to a bitmask, so that later
global options can be added more easily.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano
2005-05-27 15:54:37 -07:00
committed by Linus Torvalds
parent 09d9d1a648
commit 19feebc8c3
5 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
diff.h
View File

@ -28,11 +28,8 @@ extern void diff_unmerge(const char *path);
extern int diff_scoreopt_parse(const char *opt);
#define DIFF_FORMAT_HUMAN 0
#define DIFF_FORMAT_MACHINE 1
#define DIFF_FORMAT_PATCH 2
#define DIFF_FORMAT_NO_OUTPUT 3
extern void diff_setup(int reverse);
#define DIFF_SETUP_REVERSE 1
extern void diff_setup(int flags);
#define DIFF_DETECT_RENAME 1
#define DIFF_DETECT_COPY 2
@ -44,6 +41,11 @@ extern void diffcore_pathspec(const char **pathspec);
extern int diff_queue_is_empty(void);
#define DIFF_FORMAT_HUMAN 0
#define DIFF_FORMAT_MACHINE 1
#define DIFF_FORMAT_PATCH 2
#define DIFF_FORMAT_NO_OUTPUT 3
extern void diff_flush(int output_style, int resolve_rename_copy);
#endif /* DIFF_H */