blob: 2af1beec5f6f330072b3739e3c8b855f988173a9 (
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
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
#!/bin/sh
#
# Copyright (c) 2005 Fredrik Kuivinen
#
test_description='Test merge with directory/file conflicts'
. ./test-lib.sh
test_expect_success 'prepare repository' '
echo Hello >init &&
git add init &&
git commit -m initial &&
git branch B &&
mkdir dir &&
echo foo >dir/foo &&
git add dir/foo &&
git commit -m "File: dir/foo" &&
git checkout B &&
echo file dir >dir &&
git add dir &&
git commit -m "File: dir"
'
test_expect_success 'Merge with d/f conflicts' '
test_expect_code 1 git merge -m "merge msg" master
'
test_expect_success 'F/D conflict' '
git reset --hard &&
git checkout master &&
rm .git/index &&
mkdir before &&
echo FILE >before/one &&
echo FILE >after &&
git add . &&
git commit -m first &&
rm -f after &&
git mv before after &&
git commit -m move &&
git checkout -b para HEAD^ &&
echo COMPLETELY ANOTHER FILE >another &&
git add . &&
git commit -m para &&
git merge master
'
test_expect_success 'setup modify/delete + directory/file conflict' '
git checkout --orphan modify &&
git rm -rf . &&
git clean -fdqx &&
printf "a\nb\nc\nd\ne\nf\ng\nh\n" >letters &&
git add letters &&
git commit -m initial &&
# Throw in letters.txt for sorting order fun
# ("letters.txt" sorts between "letters" and "letters/file")
echo i >>letters &&
echo "version 2" >letters.txt &&
git add letters letters.txt &&
git commit -m modified &&
git checkout -b delete HEAD^ &&
git rm letters &&
mkdir letters &&
>letters/file &&
echo "version 1" >letters.txt &&
git add letters letters.txt &&
git commit -m deleted
'
test_expect_success 'modify/delete + directory/file conflict' '
git checkout delete^0 &&
test_must_fail git merge modify &&
test 5 -eq $(git ls-files -s | wc -l) &&
test 4 -eq $(git ls-files -u | wc -l) &&
test 1 -eq $(git ls-files -o | wc -l) &&
test -f letters/file &&
test -f letters.txt &&
test -f letters~modify
'
test_expect_success 'modify/delete + directory/file conflict; other way' '
# Yes, we really need the double reset since "letters" appears as
# both a file and a directory.
git reset --hard &&
git reset --hard &&
git clean -f &&
git checkout modify^0 &&
test_must_fail git merge delete &&
test 5 -eq $(git ls-files -s | wc -l) &&
test 4 -eq $(git ls-files -u | wc -l) &&
test 1 -eq $(git ls-files -o | wc -l) &&
test -f letters/file &&
test -f letters.txt &&
test -f letters~HEAD
'
test_done
|
