From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Phillip Wood" <phillip.wood@dunelm.org.uk>
Subject: [PATCH v2 0/2] builtin add -p: fix hunk splitting
Date: Tue, 11 Jan 2022 11:12:08 +0000 [thread overview]
Message-ID: <pull.1100.v2.git.1641899530.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1100.git.1640010777.gitgitgadget@gmail.com>
Thanks to Junio and Ævar for their comments on V1. I've updated the commit
message and added a helper function as suggested.
V1 Cover Letter: Fix a small regression in the hunk splitting of the builtin
version compared to the perl version. Thanks to Szeder for the easy to
follow bug report.
Phillip Wood (2):
t3701: clean up hunk splitting tests
builtin add -p: fix hunk splitting
add-patch.c | 20 ++++++++++------
t/t3701-add-interactive.sh | 48 ++++++++++++++++++++++++++++++++++----
2 files changed, 56 insertions(+), 12 deletions(-)
base-commit: cd3e606211bb1cf8bc57f7d76bab98cc17a150bc
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1100%2Fphillipwood%2Fwip%2Fadd-p-fix-hunk-splitting-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1100/phillipwood/wip/add-p-fix-hunk-splitting-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1100
Range-diff vs v1:
1: cc8639fc29d = 1: cc8639fc29d t3701: clean up hunk splitting tests
2: 5d5639c2b04 ! 2: b698989e265 builtin add -p: fix hunk splitting
@@ Metadata
## Commit message ##
builtin add -p: fix hunk splitting
+ The C reimplementation of "add -p" fails to split the last hunk in a
+ file if hunk ends with an addition or deletion without any post context
+ line unless it is the last file to be processed.
+
To determine whether a hunk can be split a counter is incremented each
time a context line follows an insertion or deletion. If at the end of
the hunk the value of this counter is greater than one then the hunk
@@ 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 ")) {
-+ 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);
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' '
--
gitgitgadget
next prev parent reply other threads:[~2022-01-11 11:12 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 ` Phillip Wood via GitGitGadget [this message]
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
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=pull.1100.v2.git.1641899530.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--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).