summaryrefslogtreecommitdiff
path: root/t/t4118-apply-empty-context.sh
blob: dd88e81e04beaa0e0a703efa3e4130c474ef0b69 (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
55
#!/bin/sh
#
# Copyright (c) 2006 Junio C Hamano
#

test_description='git-apply with new style GNU diff with empty context

'

. ./test-lib.sh

test_expect_success setup '
	{
		echo; echo;
		echo A; echo B; echo C;
		echo;
	} >file1 &&
	cat file1 >file1.orig &&
	{
		cat file1 &&
		echo Q | tr -d "\\012"
	} >file2 &&
	cat file2 >file2.orig
	git add file1 file2 &&
	sed -e "/^B/d" <file1.orig >file1 &&
	sed -e "/^[BQ]/d" <file2.orig >file2 &&
	echo Q | tr -d "\\012" >>file2 &&
	cat file1 >file1.mods &&
	cat file2 >file2.mods &&
	git diff |
	sed -e "s/^ \$//" >diff.output
'

test_expect_success 'apply --numstat' '

	git apply --numstat diff.output >actual &&
	{
		echo "0	1	file1" &&
		echo "0	1	file2"
	} >expect &&
	git diff expect actual

'

test_expect_success 'apply --apply' '

	cat file1.orig >file1 &&
	cat file2.orig >file2 &&
	git update-index file1 file2 &&
	git apply --index diff.output &&
	git diff file1.mods file1 &&
	git diff file2.mods file2
'

test_done