diff --no-index: fix --name-status with added files

Without this patch, an added file would be reported as /dev/null.

Noticed by David Kastrup.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff.c b/diff.c
index dc6da5e253c4a64440a2da9e2f785f3ea06bea61..da992dd4851dd67ab9a307c1b08ebed442e406cb 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2407,7 +2407,8 @@ static void diff_flush_raw(struct diff_filepair *p,
                printf("%s ",
                       diff_unique_abbrev(p->two->sha1, abbrev));
        }
                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);
        if (two_paths)
                printf("%c%s", inter_name_termination, path_two);
        putchar(line_termination);

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 8f4c29a6b5a263d6f18d95757b76ac55e9443068..4e7d68dda28a54cdc4f46e11717e113fa8dd479c 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -17,6 +17,7 @@ test_expect_success setup '
        export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
 
        mkdir dir &&
        export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
 
        mkdir dir &&

+       mkdir dir2 &&

        for i in 1 2 3; do echo $i; done >file0 &&
        for i in A B; do echo $i; done >dir/sub &&
        cat file0 >file2 &&
        for i in 1 2 3; do echo $i; done >file0 &&
        for i in A B; do echo $i; done >dir/sub &&
        cat file0 >file2 &&


@@ -252,6 +253,7 @@ diff --patch-with-stat initial..side
 diff --patch-with-raw initial..side
 diff --patch-with-stat -r initial..side
 diff --patch-with-raw -r initial..side
 diff --patch-with-raw initial..side
 diff --patch-with-stat -r initial..side
 diff --patch-with-raw -r initial..side

+diff --name-status dir2 dir

 EOF
 
 test_done
 EOF
 
 test_done

diff --git a/t/t4013/diff.diff_--name-status_dir2_dir b/t/t4013/diff.diff_--name-status_dir2_dir
new file mode 100644 (file)
index 0000000..ef7fdb7
--- /dev/null
+++ b/t/t4013/diff.diff_--name-status_dir2_dir
@@ -0,0 +1,3 @@
+$ git diff --name-status dir2 dir
+A      dir/sub
+$