Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint
"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
This commit is contained in:
@ -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
|
||||
|
Reference in New Issue
Block a user