From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: pclouds@gmail.com
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH v2 0/4] Fix i-t-a entries in git-diff and git-apply
Date: Sat, 26 May 2018 14:08:42 +0200 [thread overview]
Message-ID: <20180526120846.23663-1-pclouds@gmail.com> (raw)
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
next prev parent reply other threads:[~2018-05-26 12:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-13 17:54 [PATCH 1/2] diff: turn --ita-invisible-in-index on by default Nguyễn Thái Ngọc Duy
2018-05-13 17:54 ` [PATCH 2/2] apply: add --intent-to-add Nguyễn Thái Ngọc Duy
2018-05-14 2:33 ` Junio C Hamano
2018-05-20 6:34 ` Duy Nguyen
2018-05-21 3:14 ` Junio C Hamano
2018-05-25 3:39 ` [PATCH 1/2] diff: turn --ita-invisible-in-index on by default Jonathan Nieder
2018-05-25 14:30 ` Duy Nguyen
2018-05-25 16:43 ` Jonathan Nieder
2018-05-25 16:59 ` Duy Nguyen
2018-05-26 12:08 ` Nguyễn Thái Ngọc Duy [this message]
2018-05-26 12:08 ` [PATCH v2 1/4] diff: ignore --ita-[in]visible-in-index when diffing worktree-to-tree Nguyễn Thái Ngọc Duy
2018-05-27 7:18 ` Eric Sunshine
2018-05-26 12:08 ` [PATCH v2 2/4] diff: turn --ita-invisible-in-index on by default Nguyễn Thái Ngọc Duy
2018-05-26 12:08 ` [PATCH v2 3/4] t2203: add a test about "diff HEAD" case Nguyễn Thái Ngọc Duy
2018-05-26 12:08 ` [PATCH v2 4/4] apply: add --intent-to-add Nguyễn Thái Ngọc Duy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180526120846.23663-1-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).