From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 0/4] Correct offsets of hunks when one is skipped
Date: Tue, 13 Feb 2018 23:56:42 +0000 [thread overview]
Message-ID: <20180213235642.GD1022467@genre.crustytoothpaste.net> (raw)
In-Reply-To: <20180213104408.9887-1-phillip.wood@talktalk.net>
[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]
On Tue, Feb 13, 2018 at 10:44:04AM +0000, Phillip Wood wrote:
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> While working on a patch series to stage selected lines from a hunk
> without having to edit it I got worried that subsequent patches would
> be applied in the wrong place which lead to this series to correct the
> offsets of hunks following those that are skipped or edited.
>
> Phillip Wood (4):
> add -i: add function to format hunk header
> t3701: add failing test for pathological context lines
> add -p: Adjust offsets of subsequent hunks when one is skipped
> add -p: calculate offset delta for edited patches
>
> git-add--interactive.perl | 93 +++++++++++++++++++++++++++++++++++-----------
> t/t3701-add-interactive.sh | 30 +++++++++++++++
> 2 files changed, 102 insertions(+), 21 deletions(-)
This looks reasonably sane to me. I really like that you managed to
produce failing tests for this situation. I know pathological cases
like this have bit GCC in the past, so it's good that you fixed this.
--
brian m. carlson / brian with sandals: Houston, Texas, US
https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: https://keybase.io/bk2204
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 867 bytes --]
next prev parent reply other threads:[~2018-02-13 23:56 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-13 10:44 [PATCH 0/4] Correct offsets of hunks when one is skipped Phillip Wood
2018-02-13 10:44 ` [PATCH 1/4] add -i: add function to format hunk header Phillip Wood
2018-02-13 10:44 ` [PATCH 2/4] t3701: add failing test for pathological context lines Phillip Wood
2018-02-13 20:35 ` Junio C Hamano
2018-02-13 10:44 ` [PATCH 3/4] add -p: Adjust offsets of subsequent hunks when one is skipped Phillip Wood
2018-02-13 10:44 ` [PATCH 4/4] add -p: calculate offset delta for edited patches Phillip Wood
2018-02-13 23:56 ` brian m. carlson [this message]
2018-02-19 13:01 ` [PATCH 0/4] Correct offsets of hunks when one is skipped Phillip Wood
2018-02-19 11:29 ` [PATCH v2 0/9] " Phillip Wood
2018-02-19 11:29 ` [PATCH v2 1/9] add -i: add function to format hunk header Phillip Wood
2018-02-20 18:21 ` Junio C Hamano
2018-02-19 11:29 ` [PATCH v2 2/9] t3701: indent here documents Phillip Wood
2018-02-19 18:36 ` Eric Sunshine
2018-02-19 11:29 ` [PATCH v2 3/9] t3701: use test_write_lines and write_script Phillip Wood
2018-02-19 18:47 ` Eric Sunshine
2018-02-20 17:19 ` Junio C Hamano
2018-02-21 11:26 ` Phillip Wood
2018-02-19 11:29 ` [PATCH v2 4/9] t3701: don't hard code sha1 hash values Phillip Wood
2018-02-19 18:52 ` Eric Sunshine
2018-02-20 17:39 ` Junio C Hamano
2018-02-21 11:42 ` Phillip Wood
2018-02-21 16:58 ` Junio C Hamano
2018-02-19 11:29 ` [PATCH v2 5/9] t3701: add failing test for pathological context lines Phillip Wood
2018-02-21 11:28 ` Phillip Wood
2018-02-19 11:29 ` [PATCH v2 6/9] add -p: Adjust offsets of subsequent hunks when one is skipped Phillip Wood
2018-02-19 11:29 ` [PATCH v2 7/9] add -p: calculate offset delta for edited patches Phillip Wood
2018-02-19 11:29 ` [PATCH v2 8/9] add -p: fix counting when splitting and coalescing Phillip Wood
2018-02-19 11:29 ` [PATCH v2 9/9] add -p: don't rely on apply's '--recount' option Phillip Wood
2018-02-20 18:50 ` Junio C Hamano
2018-02-27 11:03 ` [PATCH v3 0/9] Correct offsets of hunks when one is skipped Phillip Wood
2018-02-27 11:03 ` [PATCH v3 1/9] add -i: add function to format hunk header Phillip Wood
2018-02-27 11:03 ` [PATCH v3 2/9] t3701: indent here documents Phillip Wood
2018-02-27 22:35 ` Junio C Hamano
2018-02-28 11:00 ` Phillip Wood
2018-02-28 15:37 ` Junio C Hamano
2018-03-01 10:57 ` Phillip Wood
2018-03-01 15:58 ` Junio C Hamano
2018-02-27 11:03 ` [PATCH v3 3/9] t3701: use test_write_lines and write_script Phillip Wood
2018-02-27 11:03 ` [PATCH v3 4/9] t3701: don't hard code sha1 hash values Phillip Wood
2018-02-27 22:42 ` Junio C Hamano
2018-02-28 11:03 ` Phillip Wood
2018-02-28 11:10 ` Phillip Wood
2018-02-27 11:04 ` [PATCH v3 5/9] t3701: add failing test for pathological context lines Phillip Wood
2018-02-27 11:04 ` [PATCH v3 6/9] add -p: Adjust offsets of subsequent hunks when one is skipped Phillip Wood
2018-02-27 11:04 ` [PATCH v3 7/9] add -p: calculate offset delta for edited patches Phillip Wood
2018-02-27 11:04 ` [PATCH v3 8/9] add -p: fix counting when splitting and coalescing Phillip Wood
2018-02-27 11:04 ` [PATCH v3 9/9] add -p: don't rely on apply's '--recount' option Phillip Wood
2018-03-01 10:50 ` [PATCH v4 0/9] Correct offsets of hunks when one is skipped Phillip Wood
2018-03-01 10:50 ` [PATCH v4 1/9] add -i: add function to format hunk header Phillip Wood
2018-03-01 10:50 ` [PATCH v4 2/9] t3701: indent here documents Phillip Wood
2018-03-01 10:50 ` [PATCH v4 3/9] t3701: use test_write_lines and write_script Phillip Wood
2018-03-01 10:50 ` [PATCH v4 4/9] t3701: don't hard code sha1 hash values Phillip Wood
2018-03-02 15:55 ` SZEDER Gábor
2018-03-02 16:09 ` Junio C Hamano
2018-03-05 10:59 ` Phillip Wood
2018-03-05 12:32 ` SZEDER Gábor
2018-03-01 10:50 ` [PATCH v4 5/9] t3701: add failing test for pathological context lines Phillip Wood
2018-03-01 10:51 ` [PATCH v4 6/9] add -p: adjust offsets of subsequent hunks when one is skipped Phillip Wood
2018-03-01 10:51 ` [PATCH v4 7/9] add -p: calculate offset delta for edited patches Phillip Wood
2018-03-01 20:14 ` Junio C Hamano
2018-03-02 10:36 ` Phillip Wood
2018-03-01 10:51 ` [PATCH v4 8/9] add -p: fix counting when splitting and coalescing Phillip Wood
2018-03-01 20:29 ` Junio C Hamano
2018-03-02 10:48 ` Phillip Wood
2018-03-01 10:51 ` [PATCH v4 9/9] add -p: don't rely on apply's '--recount' option Phillip Wood
2018-03-01 20:30 ` Junio C Hamano
2018-03-02 10:49 ` Phillip Wood
2018-03-05 10:56 ` [PATCH v5 0/9] Correct offsets of hunks when one is skipped Phillip Wood
2018-03-05 10:56 ` [PATCH v5 1/9] add -i: add function to format hunk header Phillip Wood
2018-03-05 10:56 ` [PATCH v5 2/9] t3701: indent here documents Phillip Wood
2018-03-05 10:56 ` [PATCH v5 3/9] t3701: use test_write_lines and write_script Phillip Wood
2018-03-05 10:56 ` [PATCH v5 4/9] t3701: don't hard code sha1 hash values Phillip Wood
2018-03-05 10:56 ` [PATCH v5 5/9] t3701: add failing test for pathological context lines Phillip Wood
2018-03-05 10:56 ` [PATCH v5 6/9] add -p: adjust offsets of subsequent hunks when one is skipped Phillip Wood
2018-03-05 10:56 ` [PATCH v5 7/9] add -p: calculate offset delta for edited patches Phillip Wood
2018-03-05 10:56 ` [PATCH v5 8/9] add -p: fix counting when splitting and coalescing Phillip Wood
2018-03-05 10:56 ` [PATCH v5 9/9] add -p: don't rely on apply's '--recount' option Phillip Wood
2018-03-05 18:50 ` [PATCH v5 0/9] Correct offsets of hunks when one is skipped Junio C Hamano
2018-03-06 10:25 ` Phillip Wood
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=20180213235642.GD1022467@genre.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--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).