Merge branch 'maint'

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index b6eb72be029c9cd2f2b33977f3a3f02099b68106..19589707c4cf40e622b0f7b98b8fd07704b37c01 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2418,7 +2418,8 @@ static void diff_flush_raw(struct diff_filepair *p,
                printf("%s ",
                       diff_unique_abbrev(p->two->sha1, abbrev));
        }
-       printf("%s%c%s", status, inter_name_termination, path_one);
+       printf("%s%c%s", status, inter_name_termination,
+                       two_paths || p->one->mode ?  path_one : path_two);
        if (two_paths)
                printf("%c%s", inter_name_termination, path_two);
        putchar(line_termination);