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
|
#!/bin/sh
test_description='git-merge with case-changing rename on case-insensitive file system'
. ./test-lib.sh
if ! test_have_prereq CASE_INSENSITIVE_FS
then
skip_all='skipping case insensitive tests - case sensitive file system'
test_done
fi
test_expect_success 'merge with case-changing rename' '
test $(git config core.ignorecase) = true &&
>TestCase &&
git add TestCase &&
git commit -m "add TestCase" &&
git tag baseline
git checkout -b with-camel &&
>foo &&
git add foo &&
git commit -m "intervening commit" &&
git checkout master &&
git rm TestCase &&
>testcase &&
git add testcase &&
git commit -m "rename to testcase" &&
git checkout with-camel &&
git merge master -m "merge" &&
test_path_is_file testcase
'
test_expect_success 'merge with case-changing rename on both sides' '
git checkout master &&
git reset --hard baseline &&
git branch -D with-camel &&
git checkout -b with-camel &&
git mv TestCase testcase &&
git commit -m "recase on branch" &&
>foo &&
git add foo &&
git commit -m "intervening commit" &&
git checkout master &&
git rm TestCase &&
>testcase &&
git add testcase &&
git commit -m "rename to testcase" &&
git checkout with-camel &&
git merge master -m "merge" &&
test_path_is_file testcase
'
test_done
|
