t6031: Add a testcase covering multiple renames across a D/F conflict
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 17, 2010 at 17:53 UTC
5601ba6574cfbd1249a6d38b72159a7d3ccf8315
1 file changed
+31
t/t6031-merge-recursive.sh
+31
@@ -57,4 +57,35 @@ test_expect_success FILEMODE 'verify executable bit on file' '
57
test -x file2
58
'
59
60
+test_expect_failure 'merging with triple rename across D/F conflict' '
61
+ git reset --hard HEAD &&
62
+ git checkout -b main &&
63
+ git rm -rf . &&
64
+
65
+ echo "just a file" >sub1 &&
66
+ mkdir -p sub2 &&
67
+ echo content1 >sub2/file1 &&
68
+ echo content2 >sub2/file2 &&
69
+ echo content3 >sub2/file3 &&
70
+ mkdir simple &&
71
+ echo base >simple/bar &&
72
+ git add -A &&
73
+ test_tick &&
74
+ git commit -m base &&
75
+
76
+ git checkout -b other &&
77
+ echo more >>simple/bar &&
78
+ test_tick &&
79
+ git commit -a -m changesimplefile &&
80
+
81
+ git checkout main &&
82
+ git rm sub1 &&
83
+ git mv sub2 sub1 &&
84
+ test_tick &&
85
+ git commit -m changefiletodir &&
86
+
87
+ test_tick &&
88
+ git merge other
89
+'
90
+
91
test_done