mirror of
https://github.com/git/git.git
synced 2024-12-05 07:53:59 +08:00
c4f3f551a6
append_cr(), remove_cr(), q_to_nul() and q_to_cr() are defined in multiple tests. Consolidate them into test-lib.sh so we can stop redefining them. The use of remove_cr() in t0020 to test for a CR is replaced with a new function has_cr() to accurately reflect what is intended (the output of remove_cr() was being thrown away). Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
45 lines
903 B
Bash
Executable File
45 lines
903 B
Bash
Executable File
#!/bin/sh
|
|
|
|
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
|