Code

diff-index: report unmerged new entries
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Aug 2009 23:25:40 +0000 (16:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2009 09:21:11 +0000 (02:21 -0700)
commit29796c6ccff3e70622398379fdcdfa3fe43333ac
treec0c2b9c2a55e3df9cce448d59e5d557d07d78a4b
parent07a4a3b4962e1fd4e40fd877427cddd7428c1bc3
diff-index: report unmerged new entries

Since an earlier change to diff-index by d1f2d7e (Make run_diff_index()
use unpack_trees(), not read_tree(), 2008-01-19), we stopped reporting an
unmerged path that does not exist in the tree, but we should.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff-lib.c
t/t7060-wtstatus.sh [new file with mode: 0755]