Add testcase for merging in a CRLF repo

If you work on a repo with core.autocrlf == true, you would expect
every text file to have CRLF EOLs. However, if you by some operation,
get a conflict, then the conflicted file has LF EOLs.

Now, of course you'd go about resolving the files conflict, and then 'git
add <file>'. When you do that, you'll get the warning saying that LF will
be replaced by CRLF. Then you commit. The end result is that you have a
workingdir with a mix of LF and CRLF files, which after some more
operations may trigger a "whole file changed" diff, due to the workingdir
file now having LF EOLs.

An LF only conflict file results in the resolved file being in LF,
the commit is in LF and a warning saying that LF will be replaced
by CRLF, and the working dir ends up with a mix of CRLF and LF files.

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t6033-merge-crlf.sh b/t/t6033-merge-crlf.sh
new file mode 100755 (executable)
index 0000000..ea22837
--- /dev/null
+++ b/t/t6033-merge-crlf.sh
@@ -0,0 +1,52 @@
+#!/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_failure '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