blob: a5664f3eb3c675af123643293af21ae096d78765 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
test_description='git apply --stat --summary test, with --recount
'
. ./test-lib.sh
UNC='s/^\(@@ -[1-9][0-9]*\),[0-9]* \(+[1-9][0-9]*\),[0-9]* @@/\1,999 \2,999 @@/'
num=0
while read title
do
num=$(( $num + 1 ))
test_expect_success "$title" '
git apply --stat --summary \
<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
'
test_expect_success "$title with recount" '
sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
git apply --recount --stat --summary >current &&
test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
'
done <<\EOF
rename
copy
rewrite
mode
non git (1)
non git (2)
non git (3)
incomplete (1)
incomplete (2)
EOF
test_expect_success 'applying a hunk header which overflows fails' '
cat >patch <<-\EOF &&
diff -u a/file b/file
--- a/file
+++ b/file
@@ -98765432109876543210 +98765432109876543210 @@
-a
+b
EOF
test_must_fail git apply patch 2>err &&
echo "error: corrupt patch at line 4" >expect &&
test_cmp expect err
'
test_done
|
