summaryrefslogtreecommitdiff
path: root/upload-pack.h
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-12-06 13:08:25 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-12-06 08:57:34 -0800
commitb4bbbbd5a247e0e75d079bca591b657ec9084a46 (patch)
treec575eff7b820e1524541268242d8b9965050831b /upload-pack.h
parentgit add -p: use non-zero exit code when the diff generation failed (diff)
downloadtgif-b4bbbbd5a247e0e75d079bca591b657ec9084a46.tar.xz
apply --allow-overlap: fix a corner case
Yes, yes, this is supposed to be only a band-aid option for `git add -p` not Doing The Right Thing. But as long as we carry the `--allow-overlap` option, we might just as well get it right. This fixes the case where one hunk inserts a line before the first line, and is followed by a hunk whose context overlaps with the first one's and which appends a line at the end. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'upload-pack.h')
0 files changed, 0 insertions, 0 deletions