From: Duy Nguyen <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 3/3] diff: turn skip_stat_unmatch on selectively
Date: Wed, 29 Jan 2014 06:52:03 +0700 [thread overview]
Message-ID: <20140128235203.GA7788@lanh> (raw)
In-Reply-To: <xmqq7g9jlny6.fsf@gitster.dls.corp.google.com>
On Tue, Jan 28, 2014 at 02:51:45PM -0800, Junio C Hamano wrote:
> >> 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).
My bad. I thought I covered all cases in my last patch (and didn't
retest it!). It turns out I should have set skip_stat_unmatch in
builtin_diff_b_f() too. This on top of 3/3 passes the tests
-- 8< --
diff --git a/builtin/diff.c b/builtin/diff.c
index 88542d9..8ab5e3d 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -89,6 +89,7 @@ static int builtin_diff_b_f(struct rev_info *revs,
if (blob[0].mode == S_IFINVALID)
blob[0].mode = canon_mode(st.st_mode);
+ revs->diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
stuff_change(&revs->diffopt,
blob[0].mode, canon_mode(st.st_mode),
blob[0].sha1, null_sha1,
-- 8< --
next prev parent reply other threads:[~2014-01-28 23:46 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
2014-01-28 23:52 ` Duy Nguyen [this message]
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=20140128235203.GA7788@lanh \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.