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.

1 files changed, 4 insertions, 7 deletions

diff --git a/diff-cache.c b/diff-cache.c
index e6373b3484..e3c4c8155c 100644
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -2,7 +2,8 @@
 #include "diff.h"
 
 static int cached_only = 0;
-static int diff_output_format = DIFF_FORMAT_HUMAN;
+static int diff_output_format = DIFF_FORMAT_RAW;
+static int diff_line_termination = '\n';
 static int match_nonexisting = 0;
 static int detect_rename = 0;
 static int find_copies_harder = 0;
@@ -226,17 +227,13 @@ int main(int argc, const char **argv)
 			continue;
 		}
 		if (!strcmp(arg, "-z")) {
-			diff_output_format = DIFF_FORMAT_MACHINE;
+			diff_line_termination = 0;
 			continue;
 		}
 		if (!strcmp(arg, "--name-only")) {
 			diff_output_format = DIFF_FORMAT_NAME;
 			continue;
 		}
-		if (!strcmp(arg, "--name-only-z")) {
-			diff_output_format = DIFF_FORMAT_NAME_Z;
-			continue;
-		}
 		if (!strcmp(arg, "-R")) {
 			diff_setup_opt |= DIFF_SETUP_REVERSE;
 			continue;
@@ -292,6 +289,6 @@ int main(int argc, const char **argv)
 		     pickaxe, pickaxe_opts,
 		     diff_break_opt,
 		     orderfile, diff_filter);
-	diff_flush(diff_output_format);
+	diff_flush(diff_output_format, diff_line_termination);
 	return ret;
 }