summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-14 17:59:17 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-14 17:59:17 -0700
commite68b6f1525c670f474d735009fec419473df0962 (patch)
treec09b5a31f4557e0008ebe4da49f1b10b0765a944 /diff.h
parentc0fd1f517efeb67df32b8d4ffa209afab14be436 (diff)
downloadgit-e68b6f1525c670f474d735009fec419473df0962.tar.gz
Split up "diff_format" into "format" and "line_termination".
This removes the separate "formats" for name and name-with-zero- termination. It also removes the difference between HUMAN and MACHINE formats, and they both become DIFF_FORMAT_RAW, with the difference being just in the line and inter-filename termination. It also makes the code easier to understand.
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/diff.h b/diff.h
index 9f9ca8be5b..e0a3207a62 100644
--- a/diff.h
+++ b/diff.h
@@ -75,13 +75,11 @@ extern void diffcore_std_no_resolve(const char **paths,
extern int diff_queue_is_empty(void);
-#define DIFF_FORMAT_HUMAN 0
-#define DIFF_FORMAT_MACHINE 1
+#define DIFF_FORMAT_RAW 1
#define DIFF_FORMAT_PATCH 2
#define DIFF_FORMAT_NO_OUTPUT 3
#define DIFF_FORMAT_NAME 4
-#define DIFF_FORMAT_NAME_Z 5
-extern void diff_flush(int output_style);
+extern void diff_flush(int output_style, int line_terminator);
#endif /* DIFF_H */