From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: "Phillip Wood" <phillip.wood123@gmail.com>,
"Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Phillip Wood" <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v2 0/2] builtin add -p: fix hunk splitting
Date: Thu, 20 Jan 2022 11:13:57 -0800 [thread overview]
Message-ID: <xmqqfspii5je.fsf@gitster.g> (raw)
In-Reply-To: <220120.86czkmn6gj.gmgdl@evledraar.gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Thu, 20 Jan 2022 09:42:27 +0100")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> On Wed, Jan 19 2022, Junio C Hamano wrote:
>
>> Phillip Wood <phillip.wood123@gmail.com> writes:
>>
>>> Even if the helper is finalizing the current hunk then I think that
>>> "nonsense" hunk would still wrong as it would be calling
>>> finalize_hunk() on _every_ context line in the hunk rather than just
>>> being called once to finalize the hunk.
>>
>> True; this triggers every time we finish reading the common context
>> lines and not at the end of hunk. In any case, I think what we
>> queued looks good for 'next'.
>
> For what it's worth (and as the person who started this side-thread) I
> agree. This looks good as-is, thanks both!
>
>>>> - if ((marker == '-' || marker == '+') && *p == ' ')
>>>> - hunk->splittable_into++;
>>>> + if (*p == ' ')
>>>> + complete_file(marker, &hunk->splittable_into);
Yup, thanks all. The fix is now in 'next' and I expect we can
safely merge it down as part of the first batch next cycle.
next prev parent reply other threads:[~2022-01-20 19:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-20 14:32 [PATCH 0/2] builtin add -p: fix hunk splitting Phillip Wood via GitGitGadget
2021-12-20 14:32 ` [PATCH 1/2] t3701: clean up hunk splitting tests Phillip Wood via GitGitGadget
2021-12-20 21:09 ` Junio C Hamano
2021-12-20 14:32 ` [PATCH 2/2] builtin add -p: fix hunk splitting Phillip Wood via GitGitGadget
2021-12-20 19:06 ` Ævar Arnfjörð Bjarmason
2022-01-11 11:13 ` Phillip Wood
2022-01-11 11:44 ` Ævar Arnfjörð Bjarmason
2021-12-20 21:30 ` Junio C Hamano
2022-01-11 11:12 ` [PATCH v2 0/2] " Phillip Wood via GitGitGadget
2022-01-11 11:12 ` [PATCH v2 1/2] t3701: clean up hunk splitting tests Phillip Wood via GitGitGadget
2022-01-11 11:12 ` [PATCH v2 2/2] builtin add -p: fix hunk splitting Phillip Wood via GitGitGadget
2022-01-11 12:07 ` [PATCH v2 0/2] " Ævar Arnfjörð Bjarmason
2022-01-11 18:57 ` Phillip Wood
2022-01-12 18:51 ` Junio C Hamano
2022-01-19 20:01 ` Phillip Wood
2022-01-20 5:02 ` Junio C Hamano
2022-01-20 8:42 ` Ævar Arnfjörð Bjarmason
2022-01-20 19:13 ` Junio C Hamano [this message]
2022-01-22 9:05 ` Johannes Schindelin
2022-01-24 11:10 ` Phillip Wood
2022-01-12 18:34 ` 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
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=xmqqfspii5je.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=szeder.dev@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).