When you 'git show :2:<file>' in a conflict, the file should have CRLF EOLs,
if the repo is configured with core.autocrlf = true.
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
---
t/t6033-merge-crlf.sh | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/t/t6033-merge-crlf.sh b/t/t6033-merge-crlf.sh
index 75d9602..f161b40 100755
--- a/t/t6033-merge-crlf.sh
+++ b/t/t6033-merge-crlf.sh
@@ -49,4 +49,22 @@ test_expect_success 'Check that conflict file is CRLF' '
test_cmp file file.temp
'
+test_expect_failure 'Check that staged file :1: is CRLF' '
+ git show :1:file >staged.temp1 &&
+ git show :1:file | remove_cr | append_cr >staged.temp2 &&
+ test_cmp staged.temp1 staged.temp2
+'
+
+test_expect_failure 'Check that staged file :2: is CRLF' '
+ git show :2:file >staged.temp1 &&
+ git show :2:file | remove_cr | append_cr >staged.temp2 &&
+ test_cmp staged.temp1 staged.temp2
+'
+
+test_expect_failure 'Check that staged file :3: is CRLF' '
+ git show :3:file >staged.temp1 &&
+ git show :3:file | remove_cr | append_cr >staged.temp2 &&
+ test_cmp staged.temp1 staged.temp2
+'
+
test_done
--
1.5.6.rc2.158.g3478
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
