summaryrefslogtreecommitdiff
path: root/t/t6033-merge-crlf.sh
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2010-01-25 16:33:57 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-25 16:42:23 -0800
commitc4f3f551a61e138f8ace9523d6b16aff37b30302 (patch)
tree839c322653b2f465367f433b8cdca1e51af99081 /t/t6033-merge-crlf.sh
parent2d7f98bac7e1d8b42c558e179ea24f5b06512622 (diff)
downloadgit-c4f3f551a61e138f8ace9523d6b16aff37b30302.tar.gz
tests: consolidate CR removal/addition functions
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>
Diffstat (limited to 't/t6033-merge-crlf.sh')
-rwxr-xr-xt/t6033-merge-crlf.sh8
1 files changed, 0 insertions, 8 deletions
diff --git a/t/t6033-merge-crlf.sh b/t/t6033-merge-crlf.sh
index 75d9602de4..e8d65eefb5 100755
--- a/t/t6033-merge-crlf.sh
+++ b/t/t6033-merge-crlf.sh
@@ -1,13 +1,5 @@
#!/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