This is based on the main patchset of this thread, and makes apply reject diffs other than creation or deletion diffs to i-t-a entries. I think that as long as --ita-visible-in-index exists as an option this probably doesn't make sense to merge into the tree - I am just including it for the record. Raymond E. Pasco (2): apply: reject modification diffs to i-t-a entries t4140: test failure of diff from empty blob to i-t-a path apply.c | 3 +++ t/t4140-apply-ita.sh | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) -- 2.28.0.5.gfc8e108108