From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: phillip.wood@dunelm.org.uk
Cc: Jochen Sprickerhof <jochen@sprickerhof.de>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH] add -p: coalesce hunks before testing applicability
Date: Mon, 3 Jun 2019 15:40:39 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1906031229110.48@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <a23789e9-ee99-d23b-ee25-1acef8d8d114@gmail.com>
Hi Phillip,
On Sun, 2 Jun 2019, Phillip Wood wrote:
> On 22/03/2019 14:06, Johannes Schindelin wrote:
>
> > On Thu, 13 Sep 2018, Phillip Wood wrote:
> >
> > > On 03/09/2018 20:01, Jochen Sprickerhof wrote:
> > >
> > > > * Phillip Wood <phillip.wood@talktalk.net> [2018-08-30 14:47]:
> > > >
> > > > > We could restore the old test condition and coalesce the hunks
> > > > > by copying all the hunks and setting $hunk->{USE}=1 when
> > > > > creating the test patch if that turns out to be useful (it would
> > > > > be interesting to see if the test still passes with that
> > > > > change).
> > > >
> > > > We set USE=1 for $newhunk already, or where would you set it?
> > >
> > > To match the old test it needs to be set on the hunks we've skipped
> > > or haven't got to yet so they're all in the patch that's tested
> > > after editing a hunk.
> >
> > The way I fixed this in the C code is by teaching the equivalent of
> > the `coalesce_overlapping_hunks()` function to simply ignore the
> > equivalent of `$hunk->{USE}`: the function signature takes an
> > additional `use_all` parameter, which will override the `use` field.
>
> That sounds like a good solution. Thanks for working on the conversion
> to C, I'll try and find time look at the code on github.
Please note that I did not update the Pull Requests on GitGitGadget
lately, as I had no reviewer feedback on #170 and did not want to waste
too much time on synchronizing my work between those PRs and Git for Windows
(which now has the built-in `git add -i` as an opt-in feature).
So: the latest patches (as of time of writing) can be found here:
https://github.com/git-for-windows/git/compare/9f09372011%5E...9f09372011%5E2
Thanks,
Dscho
next prev parent reply other threads:[~2019-06-03 13:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-28 8:58 [PATCH] add -p: coalesce hunks before testing applicability Jochen Sprickerhof
2018-08-28 18:07 ` Junio C Hamano
2018-08-30 13:47 ` Phillip Wood
2018-08-30 14:51 ` Junio C Hamano
2018-09-03 19:01 ` Jochen Sprickerhof
2018-09-13 10:20 ` Phillip Wood
2018-09-23 17:16 ` Jochen Sprickerhof
2019-03-22 14:06 ` Johannes Schindelin
2019-06-02 14:17 ` Phillip Wood
2019-06-03 13:40 ` Johannes Schindelin [this message]
2019-06-03 14:59 ` Phillip Wood
2019-06-04 13:32 ` Johannes Schindelin
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=nycvar.QRO.7.76.6.1906031229110.48@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jochen@sprickerhof.de \
--cc=phillip.wood@dunelm.org.uk \
/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).