files "test-patch" and "file" are created twice.put the second creation
of the files to its own step'setup for apply at the beginning'.
Make the second creation of the files its own step
'setup for apply at the beginning'.
Signed-off-by: Shuqi Liang <redacted>
---
t/t4113-apply-ending.sh | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/t/t4113-apply-ending.sh b/t/t4113-apply-ending.sh
index aa57895b22..d84f632bc3 100755
--- a/t/t4113-apply-ending.sh
+++ b/t/t4113-apply-ending.sh
@@ -8,8 +8,6 @@ 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
@@ -27,26 +25,27 @@ 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 'setup for apply at the beginning' '
+ 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--
2.39.0