From: Jeff King <peff@peff•net>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: What's cooking in git.git (Oct 2025, #08; Thu, 23)
Date: Fri, 24 Oct 2025 12:59:56 -0400 [thread overview]
Message-ID: <20251024165956.GA2344925@coredump.intra.peff.net> (raw)
In-Reply-To: <xmqqsef8p9n7.fsf@gitster.g>
On Fri, Oct 24, 2025 at 09:06:04AM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff•net> writes:
>
> > On Thu, Oct 23, 2025 at 04:36:01PM -0700, Junio C Hamano wrote:
> >
> >> * jc/diff-from-contents-fix (2025-10-22) 1 commit
> >> (merged to 'next' on 2025-10-23 at fae07d2113)
> >> + diff: make sure the other caller of diff_flush_patch_quietly() is silent
> >> (this branch is used by ly/diff-name-only-with-diff-from-content; uses jk/diff-from-contents-fix.)
> >>
> >> The code to squelch output from "git diff -w --name-status"
> >> etc. for paths that "git diff -w -p" would have stayed silent
> >> leaked output from dry-run patch generation, which has been
> >> corrected.
> >>
> >> Will merge to 'master'.
> >> source: <xmqqy0p4wcac.fsf@gitster•g>
> >
> > OK, looks like you picked up the fix from the last round of discussion.
> > Good. Is this destined for 'maint'? My patch fixed the regression from
> > v2.51.1 with "--quiet", but I think there is still one for "-w --raw",
> > etc.
>
> The plan is to merge "j?/diff-from-contents-fix" down to 'maint';
> any other changes that tweak dry-run are to be done 'next' down to
> 'master' but not to 'maint' as a longer term "true fix".
OK, that sounds good. I wasn't sure if it would have said "Will merge to
'master' and then 'maint'" here in that case (like it does for the jk/
version). But I guess it is just that these notes are for your human
eyes, and not a script. :)
-Peff
prev parent reply other threads:[~2025-10-24 16:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-23 23:36 What's cooking in git.git (Oct 2025, #08; Thu, 23) Junio C Hamano
2025-10-24 15:47 ` Jeff King
2025-10-24 16:06 ` Junio C Hamano
2025-10-24 16:59 ` Jeff King [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251024165956.GA2344925@coredump.intra.peff.net \
--to=peff@peff$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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