From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>
Cc: 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: Tue, 11 Jan 2022 13:07:52 +0100 [thread overview]
Message-ID: <220111.861r1ezcxn.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <pull.1100.v2.git.1641899530.gitgitgadget@gmail.com>
On Tue, Jan 11 2022, Phillip Wood via GitGitGadget wrote:
> Thanks to Junio and Ævar for their comments on V1. I've updated the commit
> message and added a helper function as suggested.
This v2 LGTM as far as the functionality of the end-state is concerned.
As a remaining nit the complete_file() helper you introduce in 2/2
changes 2/4 places that increment "hunk->splittable+into".
I grabbed this PR and came up with this amendmend to it which adds a 2/3
step that converts 3/3 of them, followed by adding the 4th user in your
2/2 (now patch 3/3):
https://github.com/git/git/compare/master...avar:phillipwood-avar/wip/add-p-fix-hunk-splitting-v2.1
It changes nothing as far as the end-state is concerned, but I think it
makes this easier to read & follow. The actual behavior change becomes a
one-line addition to add-patch.c, instead of being mixed up with the
refactoring of adding the new helper.
If you'd like to pick that up & run with it as a v3 that's fine by me,
and if not that's also fine :) Just a suggestion.
A range-diff between your v2 here and that linked-to
phillipwood-avar/wip/add-p-fix-hunk-splitting-v2.1:
1: cc8639fc29d = 1: 34392397f04 t3701: clean up hunk splitting tests
-: ----------- > 2: c082176f8c5 add-file.c: use static helper to check marker == +|-
2: b698989e265 ! 3: defca0baba4 builtin add -p: fix hunk splitting
@@ Commit message
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
## add-patch.c ##
-@@ add-patch.c: static int is_octal(const char *p, size_t len)
- return 1;
- }
-
-+static void complete_file(char marker, struct hunk *hunk)
-+{
-+ if (marker == '-' || marker == '+')
-+ /*
-+ * Last hunk ended in non-context line (i.e. it
-+ * appended lines to the file, so there are no
-+ * trailing context lines).
-+ */
-+ hunk->splittable_into++;
-+}
-+
- static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
- {
- struct strvec args = STRVEC_INIT;
@@ add-patch.c: static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
eol = pend;
if (starts_with(p, "diff ")) {
-+ complete_file(marker, hunk);
++ complete_file(marker, &hunk->splittable_into);
ALLOC_GROW_BY(s->file_diff, s->file_diff_nr, 1,
file_diff_alloc);
file_diff = s->file_diff + s->file_diff_nr - 1;
-@@ add-patch.c: static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
- file_diff->hunk->colored_end = hunk->colored_end;
- }
- }
--
-- if (marker == '-' || marker == '+')
-- /*
-- * Last hunk ended in non-context line (i.e. it appended lines
-- * to the file, so there are no trailing context lines).
-- */
-- hunk->splittable_into++;
-+ complete_file(marker, hunk);
-
- /* non-colored shorter than colored? */
- if (colored_p != colored_pend) {
## t/t3701-add-interactive.sh ##
@@ t/t3701-add-interactive.sh: test_expect_success 'correct message when there is nothing to do' '
next prev parent reply other threads:[~2022-01-11 12: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 ` Ævar Arnfjörð Bjarmason [this message]
2022-01-11 18:57 ` [PATCH v2 0/2] " 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
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=220111.861r1ezcxn.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@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).