mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
249c61a62d
The code forgot to convert the blob contents into work tree representation before writing it out. Also fixes leaks -- earlier the updated blobs were never freed. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
52 lines
1,001 B
Bash
Executable file
52 lines
1,001 B
Bash
Executable file
#!/bin/sh
|
|
|
|
append_cr () {
|
|
sed -e 's/$/Q/' | tr Q '\015'
|
|
}
|
|
|
|
remove_cr () {
|
|
tr '\015' Q | sed -e 's/Q$//'
|
|
}
|
|
|
|
test_description='merge conflict in crlf repo
|
|
|
|
b---M
|
|
/ /
|
|
initial---a
|
|
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
git config core.autocrlf true &&
|
|
echo foo | append_cr >file &&
|
|
git add file &&
|
|
git commit -m "Initial" &&
|
|
git tag initial &&
|
|
git branch side &&
|
|
echo line from a | append_cr >file &&
|
|
git commit -m "add line from a" file &&
|
|
git tag a &&
|
|
git checkout side &&
|
|
echo line from b | append_cr >file &&
|
|
git commit -m "add line from b" file &&
|
|
git tag b &&
|
|
git checkout master
|
|
'
|
|
|
|
test_expect_success 'Check "ours" is CRLF' '
|
|
git reset --hard initial &&
|
|
git merge side -s ours &&
|
|
cat file | remove_cr | append_cr >file.temp &&
|
|
test_cmp file file.temp
|
|
'
|
|
|
|
test_expect_success 'Check that conflict file is CRLF' '
|
|
git reset --hard a &&
|
|
test_must_fail git merge side &&
|
|
cat file | remove_cr | append_cr >file.temp &&
|
|
test_cmp file file.temp
|
|
'
|
|
|
|
test_done
|