Skip to content

Commit f282326

Browse files
gitstergitster
committed
Merge branch 'jc/maint-add-p-coalesce-fix' into maint
* jc/maint-add-p-coalesce-fix: t3701: ensure correctly set up repository after skipped tests Revert "git-add--interactive: remove hunk coalescing" Splitting a hunk that adds a line at the top fails in "add -p"
2 parents db8af4b + 32a9023 commit f282326

File tree

2 files changed

+133
-1
lines changed

2 files changed

+133
-1
lines changed

‎git-add--interactive.perl‎

Lines changed: 95 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,96 @@ sub split_hunk {
767767
return @split;
768768
}
769769

770+
sub find_last_o_ctx {
771+
my ($it) = @_;
772+
my $text = $it->{TEXT};
773+
my ($o_ofs, $o_cnt) = parse_hunk_header($text->[0]);
774+
my $i = @{$text};
775+
my $last_o_ctx = $o_ofs + $o_cnt;
776+
while (0 < --$i) {
777+
my $line = $text->[$i];
778+
if ($line =~ /^ /) {
779+
$last_o_ctx--;
780+
next;
781+
}
782+
last;
783+
}
784+
return $last_o_ctx;
785+
}
786+
787+
sub merge_hunk {
788+
my ($prev, $this) = @_;
789+
my ($o0_ofs, $o0_cnt, $n0_ofs, $n0_cnt) =
790+
parse_hunk_header($prev->{TEXT}[0]);
791+
my ($o1_ofs, $o1_cnt, $n1_ofs, $n1_cnt) =
792+
parse_hunk_header($this->{TEXT}[0]);
793+
794+
my (@line, $i, $ofs, $o_cnt, $n_cnt);
795+
$ofs = $o0_ofs;
796+
$o_cnt = $n_cnt = 0;
797+
for ($i = 1; $i < @{$prev->{TEXT}}; $i++) {
798+
my $line = $prev->{TEXT}[$i];
799+
if ($line =~ /^\+/) {
800+
$n_cnt++;
801+
push @line, $line;
802+
next;
803+
}
804+
805+
last if ($o1_ofs <= $ofs);
806+
807+
$o_cnt++;
808+
$ofs++;
809+
if ($line =~ /^ /) {
810+
$n_cnt++;
811+
}
812+
push @line, $line;
813+
}
814+
815+
for ($i = 1; $i < @{$this->{TEXT}}; $i++) {
816+
my $line = $this->{TEXT}[$i];
817+
if ($line =~ /^\+/) {
818+
$n_cnt++;
819+
push @line, $line;
820+
next;
821+
}
822+
$ofs++;
823+
$o_cnt++;
824+
if ($line =~ /^ /) {
825+
$n_cnt++;
826+
}
827+
push @line, $line;
828+
}
829+
my $head = ("@@ -$o0_ofs" .
830+
(($o_cnt != 1) ? ",$o_cnt" : '') .
831+
" +$n0_ofs" .
832+
(($n_cnt != 1) ? ",$n_cnt" : '') .
833+
" @@\n");
834+
@{$prev->{TEXT}} = ($head, @line);
835+
}
836+
837+
sub coalesce_overlapping_hunks {
838+
my (@in) = @_;
839+
my @out = ();
840+
841+
my ($last_o_ctx, $last_was_dirty);
842+
843+
for (grep { $_->{USE} } @in) {
844+
my $text = $_->{TEXT};
845+
my ($o_ofs) = parse_hunk_header($text->[0]);
846+
if (defined $last_o_ctx &&
847+
$o_ofs <= $last_o_ctx &&
848+
!$_->{DIRTY} &&
849+
!$last_was_dirty) {
850+
merge_hunk($out[-1], $_);
851+
}
852+
else {
853+
push @out, $_;
854+
}
855+
$last_o_ctx = find_last_o_ctx($out[-1]);
856+
$last_was_dirty = $_->{DIRTY};
857+
}
858+
return @out;
859+
}
770860

771861
sub color_diff {
772862
return map {
@@ -878,7 +968,8 @@ sub edit_hunk_loop {
878968
my $newhunk = {
879969
TEXT => $text,
880970
TYPE => $hunk->[$ix]->{TYPE},
881-
USE => 1
971+
USE => 1,
972+
DIRTY => 1,
882973
};
883974
if (diff_applies($head,
884975
@{$hunk}[0..$ix-1],
@@ -1210,6 +1301,8 @@ sub patch_update_file {
12101301
}
12111302
}
12121303

1304+
@hunk = coalesce_overlapping_hunks(@hunk);
1305+
12131306
my $n_lofs = 0;
12141307
my @result = ();
12151308
for (@hunk) {
@@ -1224,6 +1317,7 @@ sub patch_update_file {
12241317
open $fh, '| git apply --cached --recount';
12251318
for (@{$head->{TEXT}}, @result) {
12261319
print $fh $_;
1320+
print STDERR $_;
12271321
}
12281322
if (!close $fh) {
12291323
for (@{$head->{TEXT}}, @result) {

‎t/t3701-add-interactive.sh‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,4 +165,42 @@ test_expect_success FILEMODE 'stage mode but not hunk' '
165165

166166
# end of tests disabled when filemode is not usable
167167

168+
test_expect_success 'setup again' '
169+
git reset --hard &&
170+
test_chmod +x file &&
171+
echo content >>file
172+
'
173+
174+
# Write the patch file with a new line at the top and bottom
175+
cat >patch <<EOF
176+
index 180b47c..b6f2c08 100644
177+
--- a/file
178+
+++ b/file
179+
@@ -1,2 +1,4 @@
180+
+firstline
181+
baseline
182+
content
183+
+lastline
184+
EOF
185+
# Expected output, similar to the patch but w/ diff at the top
186+
cat >expected <<EOF
187+
diff --git a/file b/file
188+
index b6f2c08..61b9053 100755
189+
--- a/file
190+
+++ b/file
191+
@@ -1,2 +1,4 @@
192+
+firstline
193+
baseline
194+
content
195+
+lastline
196+
EOF
197+
# Test splitting the first patch, then adding both
198+
test_expect_success 'add first line works' '
199+
git commit -am "clear local changes" &&
200+
git apply patch &&
201+
(echo s; echo y; echo y) | git add -p file &&
202+
git diff --cached > diff &&
203+
test_cmp expected diff
204+
'
205+
168206
test_done

0 commit comments

Comments
 (0)