Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint

gitster · gitster · commit 43240cb7316a · 2017-12-06T09:09:03.000-08:00
"git apply --inaccurate-eof" when used with "--ignore-space-change"
triggered an internal sanity check, which has been fixed.

* rs/apply-inaccurate-eof-with-incomplete-line:
  apply: update line lengths for --inaccurate-eof
diff --git a/apply.c b/apply.c
@@ -2958,6 +2958,8 @@ static int apply_one_fragment(struct apply_state *state,
 	    newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {
 		old--;
 		strbuf_setlen(&newlines, newlines.len - 1);
+		preimage.line_allocated[preimage.nr - 1].len--;
+		postimage.line_allocated[postimage.nr - 1].len--;
 	}
 
 	leading = frag->leading;
diff --git a/t/t4107-apply-ignore-whitespace.sh b/t/t4107-apply-ignore-whitespace.sh
@@ -178,4 +178,18 @@ test_expect_success 'patch5 fails (--no-ignore-whitespace)' '
 	test_must_fail git apply --no-ignore-whitespace patch5.patch
 '
 
+test_expect_success 'apply --ignore-space-change --inaccurate-eof' '
+	echo 1 >file &&
+	git apply --ignore-space-change --inaccurate-eof <<-\EOF &&
+	diff --git a/file b/file
+	--- a/file
+	+++ b/file
+	@@ -1 +1 @@
+	-1
+	+2
+	EOF
+	printf 2 >expect &&
+	test_cmp expect file
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -2958,6 +2958,8 @@ static int apply_one_fragment(struct apply_state *state,`
`2958`	`2958`	`newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {`
`2959`	`2959`	`old--;`
`2960`	`2960`	`strbuf_setlen(&newlines, newlines.len - 1);`
	`2961`	`+ preimage.line_allocated[preimage.nr - 1].len--;`
	`2962`	`+ postimage.line_allocated[postimage.nr - 1].len--;`
`2961`	`2963`	`}`
`2962`	`2964`
`2963`	`2965`	`leading = frag->leading;`