blob: 66368effd5c04ebeaeba30e30eaf9ba9d7cf262a (
plain) (
blame)
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
|
#!/bin/sh
test_description='git apply for contextually independent diffs'
. ./test-lib.sh
echo '1
2
3
4
5
6
7
8' >file
test_expect_success 'setup' \
'git add file &&
git commit -q -m 1 &&
git checkout -b test &&
mv file file.tmp &&
echo 0 >file &&
cat file.tmp >>file &&
rm file.tmp &&
git commit -a -q -m 2 &&
echo 9 >>file &&
git commit -a -q -m 3 &&
git checkout master'
test_expect_success \
'check if contextually independent diffs for the same file apply' \
'( git diff test~2 test~1 && git diff test~1 test~0 )| git apply'
test_done
|
