From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> Since v1 I've added some test cleanups for t3701, fixed the counting when splitting and coalescing hunks containing "\ No newline at end of file" lines and added a patch to remove '--recount' from the invocation of 'git apply'. There are minor changes to patches 5 (previously patch 2) and patch 7 (previously patch 4) which I've explained in the comments on those patches. Otherwise the original patches are unchanged. Cover letter to v1: 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 (9): add -i: add function to format hunk header t3701: indent here documents t3701: use test_write_lines and write_script t3701: don't hard code sha1 hash values 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 add -p: fix counting when splitting and coalescing add -p: don't rely on apply's '--recount' option git-add--interactive.perl | 106 ++++++++++++----- t/t3701-add-interactive.sh | 281 ++++++++++++++++++++++++--------------------- 2 files changed, 229 insertions(+), 158 deletions(-) -- 2.16.1
