diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-03 15:01:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-03 20:44:30 (GMT) |
| commit | 3cb567386d5d0349bfb5e3aaf85e973faf685dda (patch) | |
| tree | 86865561fd3ff11e22f3832eccd4a6e29d81f120 /t | |
| parent | 9cb18f56fdee6885884f5f08bd5335a42d9034dc (diff) | |
| download | git-3cb567386d5d0349bfb5e3aaf85e973faf685dda.zip git-3cb567386d5d0349bfb5e3aaf85e973faf685dda.tar.gz git-3cb567386d5d0349bfb5e3aaf85e973faf685dda.tar.bz2 | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4013-diff-various.sh | 2 | ||||
| -rw-r--r-- | t/t4013/diff.diff_--name-status_dir2_dir | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 8f4c29a..4e7d68d 100755 --- 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 && + 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 && @@ -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 --name-status dir2 dir 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 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 +$ |