Merge three separate "fetch refs" functions

diff --git a/diff-stages.c b/diff-stages.c
index 9d33535fe0553867a892c8b1ed77b4eb7233579e..cbaba552b380403d3830b80ed3e65faacb4addc8 100644 (file)
--- a/diff-stages.c
+++ b/diff-stages.c
@@ -5,7 +5,8 @@
 #include "cache.h"
 #include "diff.h"
 
-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;
@@ -17,7 +18,8 @@ static const char *orderfile = NULL;
 static const char *diff_filter = NULL;
 
 static char *diff_stages_usage =
-"git-diff-stages [-p] [-r] [-z] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] <stage1> <stage2> [<path>...]";
+"git-diff-stages [<common diff options>] <stage1> <stage2> [<path>...]"
+COMMON_DIFF_OPTIONS_HELP;
 
 static void diff_stages(int stage1, int stage2)
 {
@@ -86,11 +88,9 @@ int main(int ac, const char **av)
                else if (!strcmp(arg, "--find-copies-harder"))
                        find_copies_harder = 1;
                else if (!strcmp(arg, "-z"))
-                       diff_output_format = DIFF_FORMAT_MACHINE;
+                       diff_line_termination = 0;
                else if (!strcmp(arg, "--name-only"))
                        diff_output_format = DIFF_FORMAT_NAME;
-               else if (!strcmp(arg, "--name-only-z"))
-                       diff_output_format = DIFF_FORMAT_NAME_Z;
                else if (!strcmp(arg, "-R"))
                        diff_setup_opt |= DIFF_SETUP_REVERSE;
                else if (!strncmp(arg, "-S", 2))
@@ -125,6 +125,6 @@ int main(int ac, const char **av)
                     diff_break_opt,
                     orderfile,
                     diff_filter);
-       diff_flush(diff_output_format);
+       diff_flush(diff_output_format, diff_line_termination);
        return 0;
 }