Revision 2496da42118087e6766964c7a7b94f45daf372f4 authored by Junio C Hamano on 19 September 2020, 00:58:00 UTC, committed by Junio C Hamano on 19 September 2020, 00:58:00 UTC
A follow-up fix to a topic already in 'master'.

* rs/parallel-read-cache-fix:
  read-cache: fix mem-pool allocation for multi-threaded index loading
2 parent s 21de7e9 + bcd2c5e
Raw File
t4113-apply-ending.sh
#!/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
back to top