From: Varun Naik <vcnaik94@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: [PATCH v3] diff-lib.c: handle empty deleted ita files
Date: Fri, 14 Feb 2020 09:12:13 -0800 [thread overview]
Message-ID: <CAK_rgsEV9t3okUDrG5mHX3DkyZFCX7yGoJEsSeCGTK7zBHJPgA@mail.gmail.com> (raw)
In-Reply-To: <xmqqwof8x66a.fsf@gitster-ct.c.googlers.com>
On Mon, Aug 19, 2019 at 1:15 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> I do agree that diff-lib.c::show_modified(), which is about "git
> diff-cache" (and hence "git diff <tree-ish>", i.e. comparison
> between a tree-ish and the index), is the right layer for this
> change.
>
> I am not offhand sure about the diff.c::diff_change(), though, and
> cannot say much without first thinking about it a bit more.
I'm back!
I made the changes to "struct diff_filespec" and diff_resolve_rename_copy()
that I mentioned in my previous email on this thread, and it seems to work.
But the patch seems very clunky. Even though it has been in the back of my
mind for six months, I can't think of a more elegant approach. Furthermore,
the few test cases that I could create are extremely unlikely in practice. For
all of these reasons, I would rather avoid this patch altogether.
v2 is still sitting in pu. Could we discard it? I'll send an update to the
related patch [0] in a few minutes.
[0]: https://public-inbox.org/git/20190821032100.73917-1-vcnaik94@gmail.com/
Best,
Varun
prev parent reply other threads:[~2020-02-14 17:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 15:02 [PATCH] reset: unstage empty deleted ita files Varun Naik
2019-07-26 4:48 ` [PATCH v2] " Varun Naik
2019-07-26 18:19 ` Junio C Hamano
2019-07-29 6:52 ` Varun Naik
2019-07-29 16:07 ` Junio C Hamano
2019-08-01 16:15 ` [PATCH v3] diff-lib.c: handle " Varun Naik
2019-08-15 16:26 ` Varun Naik
2019-08-15 19:06 ` Junio C Hamano
2019-08-19 15:42 ` Varun Naik
2019-08-19 20:15 ` Junio C Hamano
2020-02-14 17:12 ` Varun Naik [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAK_rgsEV9t3okUDrG5mHX3DkyZFCX7yGoJEsSeCGTK7zBHJPgA@mail.gmail.com \
--to=vcnaik94@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).