| #!/bin/sh |
| # |
| # Copyright (c) 2006 Catalin Marinas |
| # |
| |
| test_description='git apply trying to add an ending line. |
| |
| ' |
| . ./test-lib.sh |
| |
| # setup |
| |
| cat >test-patch <<\EOF |
| diff --git a/file b/file |
| --- a/file |
| +++ b/file |
| @@ -1,2 +1,3 @@ |
| a |
| b |
| +c |
| EOF |
| |
| echo 'a' >file |
| echo 'b' >>file |
| echo 'c' >>file |
| |
| test_expect_success setup \ |
| 'git update-index --add file' |
| |
| # test |
| |
| test_expect_success 'apply at the end' \ |
| 'test_must_fail git apply --index test-patch' |
| |
| cat >test-patch <<\EOF |
| diff a/file b/file |
| --- a/file |
| +++ b/file |
| @@ -1,2 +1,3 @@ |
| +a |
| b |
| c |
| EOF |
| |
| echo >file 'a |
| b |
| c' |
| git update-index file |
| |
| test_expect_success 'apply at the beginning' \ |
| 'test_must_fail git apply --index test-patch' |
| |
| test_done |