Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
l10n: zh_CN: for git v2.23.0 l10n round 1~2
[gitweb.git]
/
git-add--interactive.perl
diff --git
a/git-add--interactive.perl
b/git-add--interactive.perl
index 3dfb3629c99617e83e75c5652fa567ad589f551a..c20ae9e2102bff6bbf7b66135e2174ec68b33e81 100755
(executable)
--- a/
git-add--interactive.perl
+++ b/
git-add--interactive.perl
@@
-986,7
+986,11
@@
sub coalesce_overlapping_hunks {
next;
}
if ($ofs_delta) {
- $n_ofs += $ofs_delta;
+ if ($patch_mode_flavour{IS_REVERSE}) {
+ $o_ofs -= $ofs_delta;
+ } else {
+ $n_ofs += $ofs_delta;
+ }
$_->{TEXT}->[0] = format_hunk_header($o_ofs, $o_cnt,
$n_ofs, $n_cnt);
}