Skip to content

Commit 6a055aa

Browse files
committed
Add exact line test for TextFragment#ApplyStrict
This ensures the line number is used and application isn't based only on matching context lines.
1 parent 774281f commit 6a055aa

File tree

4 files changed

+62
-0
lines changed

4 files changed

+62
-0
lines changed

gitdiff/apply_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ func TestTextFragmentApplyStrict(t *testing.T) {
2323
"changeStart": {File: "change_start"},
2424
"changeMiddle": {File: "change_middle"},
2525
"changeEnd": {File: "change_end"},
26+
"changeExact": {File: "change_exact"},
2627
"changeSingleNoEOL": {File: "change_single_noeol"},
2728
}
2829

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
line
2+
line
3+
line
4+
line
5+
line
6+
line
7+
line
8+
line
9+
line
10+
line
11+
line
12+
line
13+
line
14+
line
15+
line
16+
new line a
17+
line
18+
line
19+
line
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/gitdiff/testdata/apply/text_fragment_change_exact.src b/gitdiff/testdata/apply/text_fragment_change_exact.src
2+
--- a/gitdiff/testdata/apply/text_fragment_change_exact.src
3+
+++ b/gitdiff/testdata/apply/text_fragment_change_exact.src
4+
@@ -13,7 +13,7 @@ line
5+
line
6+
line
7+
line
8+
-line
9+
+new line a
10+
line
11+
line
12+
line
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
line
2+
line
3+
line
4+
line
5+
line
6+
line
7+
line
8+
line
9+
line
10+
line
11+
line
12+
line
13+
line
14+
line
15+
line
16+
line
17+
line
18+
line
19+
line
20+
line
21+
line
22+
line
23+
line
24+
line
25+
line
26+
line
27+
line
28+
line
29+
line
30+
line

0 commit comments

Comments
 (0)