diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-03-14 22:01:04 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 22:01:04 +0300 |
commit | 436d18f2d00b61bea44be2f8d35a437172132873 (patch) | |
tree | 272c55288cc2f993f0ec7be7d3016cd6597145c8 /strbuf.c | |
parent | b423234dde181bc8b951ec570ad50dd83d39ddc7 (diff) | |
parent | 3a8522f41ff45b16e06888d2b164252c9aeeaa03 (diff) |
Merge branch 'pw/add-p-recount'
"git add -p" has been lazy in coalescing split patches before
passing the result to underlying "git apply", leading to corner
case bugs; the logic to prepare the patch to be applied after hunk
selections has been tightened.
* pw/add-p-recount:
add -p: don't rely on apply's '--recount' option
add -p: fix counting when splitting and coalescing
add -p: calculate offset delta for edited patches
add -p: adjust offsets of subsequent hunks when one is skipped
t3701: add failing test for pathological context lines
t3701: don't hard code sha1 hash values
t3701: use test_write_lines and write_script
t3701: indent here documents
add -i: add function to format hunk header
Diffstat (limited to 'strbuf.c')
0 files changed, 0 insertions, 0 deletions