Revision 2e8451e8602380a8a129f21da6364f3ea879e6a9 authored by Jiang Xin on 26 July 2013, 06:00:02 UTC, committed by Jiang Xin on 03 August 2013, 06:14:07 UTC
Translate 99 new messages came from git.pot update in 28b3cff (l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)). Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
1 parent e06dc12
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
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...