diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-04 16:25:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 02:21:11 -0700 |
| commit | 29796c6ccff3e70622398379fdcdfa3fe43333ac (patch) | |
| tree | c0c2b9c2a55e3df9cce448d59e5d557d07d78a4b /diff-lib.c | |
| parent | 07a4a3b4962e1fd4e40fd877427cddd7428c1bc3 (diff) | |
| download | git-29796c6ccff3e70622398379fdcdfa3fe43333ac.tar.gz | |
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>
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-lib.c b/diff-lib.c index ad2a4cde74..ad5b6cac7b 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -348,8 +348,8 @@ static void do_oneway_diff(struct unpack_trees_options *o, match_missing = !revs->ignore_merges; if (cached && idx && ce_stage(idx)) { - if (tree) - diff_unmerge(&revs->diffopt, idx->name, idx->ce_mode, idx->sha1); + diff_unmerge(&revs->diffopt, idx->name, idx->ce_mode, + idx->sha1); return; } |