diff: ignore --ita-[in]visible-in-index when diffing worktree-to-tree
This option is supposed to fix the diff of "diff-files" (not reporting ita entries as new files) and "diff-index --cached <tree>" (showing ita entries as present in the index with empty content) but not "diff-index <tree>". When --ita-invisible-in-index is set on "git diff-index <tree>", unpack_trees() will eventually call oneway_diff() on the ita entry with the same code flow as "diff-index --cached <tree>". We want to ignore the ita entry for "diff-index --cached <tree>" but not "diff-index <tree>" since the latter will examine and produce a diff based on worktree entry's (real) content, not ita index entry's (empty) content. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
May 26, 2018 at 14:08 UTC
ba4e356109e5bf2b86bde335128c0ab4161268a9
2 files changed
+7
-3
diff-lib.c
+6
-2
@@ -389,8 +389,12 @@ static void do_oneway_diff(struct unpack_trees_options *o,
389
struct rev_info *revs = o->unpack_data;
390
int match_missing, cached;
391
392
- /* i-t-a entries do not actually exist in the index */
393
- if (revs->diffopt.ita_invisible_in_index &&
392
+ /*
393
+ * i-t-a entries do not actually exist in the index (if we're
394
+ * looking at its content)
395
+ */
396
+ if (o->index_only &&
397
+ revs->diffopt.ita_invisible_in_index &&
398
idx && ce_intent_to_add(idx)) {
399
idx = NULL;
400
if (!tree)
t/t2203-add-intent.sh
+1
-1
@@ -70,7 +70,7 @@ test_expect_success 'i-t-a entry is simply ignored' '
70
git commit -m second &&
71
test $(git ls-tree HEAD -- nitfol | wc -l) = 0 &&
72
test $(git diff --name-only HEAD -- nitfol | wc -l) = 1 &&
73
- test $(git diff --name-only --ita-invisible-in-index HEAD -- nitfol | wc -l) = 0 &&
73
+ test $(git diff --name-only --ita-invisible-in-index HEAD -- nitfol | wc -l) = 1 &&
74
test $(git diff --name-only --ita-invisible-in-index -- nitfol | wc -l) = 1
75
'
76