mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
baa37bff9a
"git mv hello.txt Hello.txt" on a case insensitive filesystem always triggers "destination already exists" error, because these two names refer to the same path from the filesystem's point of view, and requires the user to give "--force" when correcting the case of the path recorded in the index and in the next commit. Detect this case and allow it without requiring "--force". Signed-off-by: David Turner <dturner@twitter.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
53 lines
1.2 KiB
Bash
Executable file
53 lines
1.2 KiB
Bash
Executable file
#!/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
|