From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 3/3] diff: turn skip_stat_unmatch on selectively
Date: Tue, 28 Jan 2014 14:51:45 -0800 [thread overview]
Message-ID: <xmqq7g9jlny6.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqd2jdm1jj.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Mon, 27 Jan 2014 15:45:52 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
>
>> skip_stat_unmatch flag is added in fb13227 (git-diff: squelch "empty"
>> diffs - 2007-08-03) to ignore empty diffs caused by stat-only
>> dirtiness. In some diff case, stat is not involved at all. While
>> the code is written in a way that no expensive I/O is done, we still
>> need to move all file pairs from the old queue to the new queue in
>> diffcore_skip_stat_unmatch().
>>
>> Only enable it when worktree is involved: "diff" and "diff <rev>".
>> This should help track down how skip_stat_unmatch is actually used
>> when bugs occur.
>>
>> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
>> ---
>> This replaces 'diff: turn off skip_stat_unmatch on "diff --cached"'
>> The previous patch obviously leaves skip_stat_unmatch on in "diff
>> <rev> <rev>" and maybe other cases.
>
> Oops, I lost track. Sorry.
Together with {1,2}/3 applied on maint-1.8.4, this sems to break
t3417 (there may be others, but I didn't have time to check).
next prev parent reply other threads:[~2014-01-28 22:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-23 2:45 bug with git-diff --quiet IWAMOTO Toshihiro
2014-01-25 4:03 ` Duy Nguyen
2014-01-25 6:46 ` [PATCH 1/3] Move diffcore_skip_stat_unmatch core logic out for reuse later Nguyễn Thái Ngọc Duy
2014-01-25 6:46 ` [PATCH 2/3] diff: do not quit early on stat-dirty files Nguyễn Thái Ngọc Duy
2014-01-25 6:46 ` [PATCH 3/3] diff: turn off skip_stat_unmatch on "diff --cached" Nguyễn Thái Ngọc Duy
2014-01-27 22:59 ` [PATCH v2 3/3] diff: turn skip_stat_unmatch on selectively Nguyễn Thái Ngọc Duy
2014-01-27 23:45 ` Junio C Hamano
2014-01-28 22:51 ` Junio C Hamano [this message]
2014-01-28 23:52 ` Duy Nguyen
2014-01-29 19:25 ` Junio C Hamano
2014-01-30 5:36 ` Duy Nguyen
2014-01-31 16:17 ` Junio C Hamano
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=xmqq7g9jlny6.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.