summaryrefslogtreecommitdiff
path: root/t/t4101-apply-nonl.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-07-22 09:56:39 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-22 10:26:01 -0700
commit8b64647dd9009f52e23e7fdb443b7b8f9502278a (patch)
treeb5bf78e0adb24a14571d4749b79cbad40da3aff4 /t/t4101-apply-nonl.sh
parentf0b32737ad5a35cc047db47353a75faccfe5939e (diff)
downloadgit-8b64647dd9009f52e23e7fdb443b7b8f9502278a.tar.gz
[PATCH] apply.c: handle incomplete lines correctly.
The parsing code had a bug that failed to recognize an incomplete line at the end of a fragment, and the fragment application code had a comparison bug to recognize such. Fix them to handle incomplete lines correctly. Add a test script for patches with various combinations of complete and incomplete lines to make sure the fix works. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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 0000000000..380ef15a27
--- /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