Fix i-t-a entries in git-diff and git-apply
Get series with b4
b4 am [email protected]Versions newest first
- v2 Latest4 patches 1 replyIn review
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/4 | diff: ignore --ita-[in]visible-in-index when diffing worktree-to-treediff-lib.c t/ | +7 | 1 reply | |
| 2/4 | diff: turn --ita-invisible-in-index on by defaultbuiltin/ t/ t/ | +41 | 0 replies | |
| 3/4 | t2203: add a test about "diff HEAD" caset/ | +17 | 0 replies | |
| 4/4 | apply: add --intent-to-addDocumentation/ apply.c apply.h +1 more | +35 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
Cover letter [PATCH v2 0/4] Fix i-t-a entries in git-diff and git-apply
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(-)
Signature · 1 line
2.17.0.705.g3525833791