summaryrefslogtreecommitdiff
path: root/t/t4101-apply-nonl.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t4101-apply-nonl.sh')
-rwxr-xr-xt/t4101-apply-nonl.sh32
1 files changed, 32 insertions, 0 deletions
diff --git a/t/t4101-apply-nonl.sh b/t/t4101-apply-nonl.sh
new file mode 100755
index 0000000..380ef15
--- /dev/null
+++ b/t/t4101-apply-nonl.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Junio C Hamano
+#
+
+test_description='git-apply should handle files with incomplete lines.
+
+'
+. ./test-lib.sh
+
+# setup
+
+(echo a; echo b) >frotz.0
+(echo a; echo b; echo c) >frotz.1
+(echo a; echo b | tr -d '\012') >frotz.2
+(echo a; echo c; echo b | tr -d '\012') >frotz.3
+
+for i in 0 1 2 3
+do
+ for j in 0 1 2 3
+ do
+ test $i -eq $j && continue
+ diff -u frotz.$i frotz.$j |
+ sed -e '
+ /^---/s|.*|--- a/frotz|
+ /^+++/s|.*|+++ b/frotz|' >diff.$i-$j
+ cat frotz.$i >frotz
+ test_expect_success \
+ "apply diff between $i and $j" \
+ "git-apply <diff.$i-$j && diff frotz.$j frotz"
+ done
+done