[PATCH 0/8] Resurrect "diff-lib.c: adjust position of i-t-a entries in diff"
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Aug 22, 2015, 01:08 UTC
- Message-ID
- <1440205700-19749-1-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <xmqqy4j80wdb.fsf@gitster.dls.corp.google.com>
On Thu, Jun 25, 2015 at 8:07 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 11 quoted lines
>>> Perhaps a good and safe way forward to resurrect what d95d728a >>> wanted to do is to first add an option to tell run_diff_index() and >>> run_diff_files() which behaviour the caller wants to see, add that >>> only to the caller in wt-status.c? Then incrementally pass that >>> option from more callsites that we are absolutely certain that want >>> this different worldview with respect to i-t-a? >> >> Agreed. > > OK. Perhaps then first I should do that revert and we'll > incrementally rebuild on top.
Here comes the rebuild. This adds --shift-ita option (and an internal flag) to enable this behavior. Those only take the last two patches. The remaining is to make sure we handle i-t-a entries correctly in some commands.
Nguyễn Thái Ngọc Duy (8): blame: remove obsolete comment Add and use convenient macro ce_intent_to_add() apply: fix adding new files on i-t-a entries apply: make sure check_preimage() does not leave empty file on error checkout(-index): do not checkout i-t-a entries grep: make it clear i-t-a entries are ignored diff.h: extend "flags" field to 64 bits because we're out of bits Resurrect "diff-lib.c: adjust position of i-t-a entries in diff"
Documentation/diff-options.txt | 6 +++ builtin/apply.c | 13 ++++--- builtin/blame.c | 5 --- builtin/checkout-index.c | 5 ++- builtin/checkout.c | 2 + builtin/commit.c | 2 +- builtin/grep.c | 2 +- builtin/rm.c | 2 +- cache-tree.c | 2 +- cache.h | 1 + diff-lib.c | 18 ++++++++- diff.c | 4 +- diff.h | 9 +++-- read-cache.c | 4 +- t/t2203-add-intent.sh | 83 +++++++++++++++++++++++++++++++++++++++++- wt-status.c | 2 + 16 files changed, 134 insertions(+), 26 deletions(-)
-- 2.3.0.rc1.137.g477eb31