Re: [PATCH 0/4] Correct offsets of hunks when one is skipped
On 13/02/18 23:56, brian m. carlson wrote: > On Tue, Feb 13, 2018 at 10:44:04AM +, Phillip Wood wrote: >> From: Phillip Wood>> >> 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. > Thanks Brain, it's interesting to hear that GCC has been bitten in the past Best Wishes Phillip
Re: [PATCH 0/4] Correct offsets of hunks when one is skipped
On Tue, Feb 13, 2018 at 10:44:04AM +, Phillip Wood wrote: > From: Phillip Wood> > 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 signature.asc Description: PGP signature
[PATCH 0/4] Correct offsets of hunks when one is skipped
From: Phillip WoodWhile 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(-) -- 2.16.1