[PATCH v2 0/4] Fix i-t-a entries in git-diff and git-apply
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- May 26, 2018, 12:08 UTC
- Message-ID
- <20180526120846.23663-1-pclouds@gmail.com>
- In-Reply-To
- <20180513175438.32152-1-pclouds@gmail.com>
v2 first fixes a bug in --ita-invisible-in-index that accidentally affects diffing a worktree and a tree. This caused a regression when v1's 1/2 turned this option on by default.
Other than that, 4/4 should address Junio's comments on v1's 2/2.
Nguyễn Thái Ngọc Duy (4): diff: ignore --ita-[in]visible-in-index when diffing worktree-to-tree diff: turn --ita-invisible-in-index on by default t2203: add a test about "diff HEAD" case apply: add --intent-to-add
Documentation/git-apply.txt | 10 +++++- apply.c | 19 +++++++---- apply.h | 1 + builtin/diff.c | 7 ++++ diff-lib.c | 8 +++-- t/t2203-add-intent.sh | 64 +++++++++++++++++++++++++++++++++---- t/t4011-diff-symlink.sh | 10 +++--- 7 files changed, 99 insertions(+), 20 deletions(-)
-- 2.17.0.705.g3525833791