[PATCH] checkout-cache: add usage string.

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index 36bbda6d8de847a912b21afc705cad63d121f5c9..d0962bac9629e886f6b4f7c30f0547542e94a237 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -818,6 +818,12 @@ static void diff_flush_raw(struct diff_filepair *p,
        putchar(line_termination);
 }
 
+static void diff_flush_name(struct diff_filepair *p,
+                           int line_termination)
+{
+       printf("%s%c", p->two->path, line_termination);
+}
+
 int diff_unmodified_pair(struct diff_filepair *p)
 {
        /* This function is written stricter than necessary to support
@@ -978,7 +984,8 @@ void diff_flush(int diff_output_style)
        int line_termination = '\n';
        int inter_name_termination = '\t';
 
-       if (diff_output_style == DIFF_FORMAT_MACHINE)
+       if (diff_output_style == DIFF_FORMAT_MACHINE ||
+           diff_output_style == DIFF_FORMAT_NAME_Z)
                line_termination = inter_name_termination = 0;
 
        for (i = 0; i < q->nr; i++) {
@@ -997,6 +1004,10 @@ void diff_flush(int diff_output_style)
                        diff_flush_raw(p, line_termination,
                                       inter_name_termination);
                        break;
+               case DIFF_FORMAT_NAME:
+               case DIFF_FORMAT_NAME_Z:
+                       diff_flush_name(p, line_termination);
+                       break;
                }
        }
        for (i = 0; i < q->nr; i++)