diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-05-26 14:08:43 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-29 12:36:31 +0900 |
commit | ba4e356109e5bf2b86bde335128c0ab4161268a9 (patch) | |
tree | c505c3f75f31d6b5f00a1d29b41cf84fce6d1115 /compat/precompose_utf8.h | |
parent | The fifth batch for 2.18 (diff) | |
download | tgif-ba4e356109e5bf2b86bde335128c0ab4161268a9.tar.xz |
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>
Diffstat (limited to 'compat/precompose_utf8.h')
0 files changed, 0 insertions, 0 deletions