mirror of
https://github.com/git/git.git
synced 2024-05-25 22:56:10 +02:00
d492b31caf
This patch changes every occurrence of "! git" -- with the meaning that a git call has to gracefully fail -- into "test_must_fail git". This is useful to - make sure the test does not fail because of a signal, e.g. SIGSEGV, and - advertise the use of "test_must_fail" for new tests. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
54 lines
691 B
Bash
Executable File
54 lines
691 B
Bash
Executable File
#!/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
|