X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff-files.c;h=2e6416e386331b0b5f44bb3a407dbc0ab6ed8145;hb=3342d8500f8393ace9030a44496943b6a8de1dc3;hp=4e7d9673ce95cb0de71bdca1d73ec017781039ec;hpb=c0fd1f517efeb67df32b8d4ffa209afab14be436;p=git.git

diff --git a/diff-files.c b/diff-files.c
index 4e7d9673..2e6416e3 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -6,12 +6,13 @@
 #include "cache.h"
 #include "diff.h"
 
-static const char *diff_files_usage =
+static const char diff_files_usage[] =
 "git-diff-files [-q] "
 "[<common diff options>] [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;
 
-static int diff_output_format = DIFF_FORMAT_HUMAN;
+static int diff_output_format = DIFF_FORMAT_RAW;
+static int diff_line_termination = '\n';
 static int detect_rename = 0;
 static int find_copies_harder = 0;
 static int diff_setup_opt = 0;
@@ -57,11 +58,9 @@ int main(int argc, const char **argv)
 		else if (!strcmp(argv[1], "-s"))
 			; /* no-op */
 		else if (!strcmp(argv[1], "-z"))
-			diff_output_format = DIFF_FORMAT_MACHINE;
+			diff_line_termination = 0;
 		else if (!strcmp(argv[1], "--name-only"))
 			diff_output_format = DIFF_FORMAT_NAME;
-		else if (!strcmp(argv[1], "--name-only-z"))
-			diff_output_format = DIFF_FORMAT_NAME_Z;
 		else if (!strcmp(argv[1], "-R"))
 			diff_setup_opt |= DIFF_SETUP_REVERSE;
 		else if (!strncmp(argv[1], "-S", 2))
@@ -153,6 +152,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 0;
 }