mirror of
https://github.com/git/git.git
synced 2024-10-02 06:32:08 +02:00
beeeb45493
An unusual sort of person (not me) may even enjoy the conflicts from line-ending changes. But more importantly, it is useful to document that behavior so we can more easily notice if it changes in an uncontrolled way while no one is watching. Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
190 lines
3.7 KiB
Bash
Executable File
190 lines
3.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='CRLF merge conflict across text=auto change
|
|
|
|
* [master] remove .gitattributes
|
|
! [side] add line from b
|
|
--
|
|
+ [side] add line from b
|
|
* [master] remove .gitattributes
|
|
* [master^] add line from a
|
|
* [master~2] normalize file
|
|
*+ [side^] Initial
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
git config core.autocrlf false &&
|
|
|
|
echo first line | append_cr >file &&
|
|
echo first line >control_file &&
|
|
echo only line >inert_file &&
|
|
|
|
git add file control_file inert_file &&
|
|
test_tick &&
|
|
git commit -m "Initial" &&
|
|
git tag initial &&
|
|
git branch side &&
|
|
|
|
echo "* text=auto" >.gitattributes &&
|
|
touch file &&
|
|
git add .gitattributes file &&
|
|
test_tick &&
|
|
git commit -m "normalize file" &&
|
|
|
|
echo same line | append_cr >>file &&
|
|
echo same line >>control_file &&
|
|
git add file control_file &&
|
|
test_tick &&
|
|
git commit -m "add line from a" &&
|
|
git tag a &&
|
|
|
|
git rm .gitattributes &&
|
|
rm file &&
|
|
git checkout file &&
|
|
test_tick &&
|
|
git commit -m "remove .gitattributes" &&
|
|
git tag c &&
|
|
|
|
git checkout side &&
|
|
echo same line | append_cr >>file &&
|
|
echo same line >>control_file &&
|
|
git add file control_file &&
|
|
test_tick &&
|
|
git commit -m "add line from b" &&
|
|
git tag b &&
|
|
|
|
git checkout master
|
|
'
|
|
|
|
test_expect_success 'set up fuzz_conflict() helper' '
|
|
fuzz_conflict() {
|
|
sed -e "s/^\([<>=]......\) .*/\1/" "$@"
|
|
}
|
|
'
|
|
|
|
test_expect_success 'Merge after setting text=auto' '
|
|
cat <<-\EOF >expected &&
|
|
first line
|
|
same line
|
|
EOF
|
|
|
|
git config merge.renormalize true &&
|
|
git rm -fr . &&
|
|
rm -f .gitattributes &&
|
|
git reset --hard a &&
|
|
git merge b &&
|
|
test_cmp expected file
|
|
'
|
|
|
|
test_expect_success 'Merge addition of text=auto' '
|
|
cat <<-\EOF >expected &&
|
|
first line
|
|
same line
|
|
EOF
|
|
|
|
git config merge.renormalize true &&
|
|
git rm -fr . &&
|
|
rm -f .gitattributes &&
|
|
git reset --hard b &&
|
|
git merge a &&
|
|
test_cmp expected file
|
|
'
|
|
|
|
test_expect_success 'Detect CRLF/LF conflict after setting text=auto' '
|
|
q_to_cr <<-\EOF >expected &&
|
|
<<<<<<<
|
|
first line
|
|
same line
|
|
=======
|
|
first lineQ
|
|
same lineQ
|
|
>>>>>>>
|
|
EOF
|
|
|
|
git config merge.renormalize false &&
|
|
rm -f .gitattributes &&
|
|
git reset --hard a &&
|
|
test_must_fail git merge b &&
|
|
fuzz_conflict file >file.fuzzy &&
|
|
test_cmp expected file.fuzzy
|
|
'
|
|
|
|
test_expect_success 'Detect LF/CRLF conflict from addition of text=auto' '
|
|
q_to_cr <<-\EOF >expected &&
|
|
<<<<<<<
|
|
first lineQ
|
|
same lineQ
|
|
=======
|
|
first line
|
|
same line
|
|
>>>>>>>
|
|
EOF
|
|
|
|
git config merge.renormalize false &&
|
|
rm -f .gitattributes &&
|
|
git reset --hard b &&
|
|
test_must_fail git merge a &&
|
|
fuzz_conflict file >file.fuzzy &&
|
|
test_cmp expected file.fuzzy
|
|
'
|
|
|
|
test_expect_failure 'checkout -m after setting text=auto' '
|
|
cat <<-\EOF >expected &&
|
|
first line
|
|
same line
|
|
EOF
|
|
|
|
git config merge.renormalize true &&
|
|
git rm -fr . &&
|
|
rm -f .gitattributes &&
|
|
git reset --hard initial &&
|
|
git checkout a -- . &&
|
|
git checkout -m b &&
|
|
test_cmp expected file
|
|
'
|
|
|
|
test_expect_failure 'checkout -m addition of text=auto' '
|
|
cat <<-\EOF >expected &&
|
|
first line
|
|
same line
|
|
EOF
|
|
|
|
git config merge.renormalize true &&
|
|
git rm -fr . &&
|
|
rm -f .gitattributes file &&
|
|
git reset --hard initial &&
|
|
git checkout b -- . &&
|
|
git checkout -m a &&
|
|
test_cmp expected file
|
|
'
|
|
|
|
test_expect_failure 'cherry-pick patch from after text=auto was added' '
|
|
append_cr <<-\EOF >expected &&
|
|
first line
|
|
same line
|
|
EOF
|
|
|
|
git config merge.renormalize true &&
|
|
git rm -fr . &&
|
|
git reset --hard b &&
|
|
test_must_fail git cherry-pick a >err 2>&1 &&
|
|
grep "[Nn]othing added" err &&
|
|
test_cmp expected file
|
|
'
|
|
|
|
test_expect_success 'Test delete/normalize conflict' '
|
|
git checkout -f side &&
|
|
git rm -fr . &&
|
|
rm -f .gitattributes &&
|
|
git reset --hard initial &&
|
|
git rm file &&
|
|
git commit -m "remove file" &&
|
|
git checkout master &&
|
|
git reset --hard a^ &&
|
|
git merge side
|
|
'
|
|
|
|
test_done
|