development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 10:38:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

[PATCH] apply.c: handle incomplete lines correctly.

Browse source 
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>
This commit is contained in:
Junio C Hamano 2005-07-22 09:56:39 -07:00 committed by Linus Torvalds
parent f0b32737ad
commit 8b64647dd9
2 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apply.c
View file

@ -679,6 +679,13 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s
break;
}
}
/* If a fragment ends with an incomplete line, we failed to include
* it in the above loop because we hit oldlines == newlines == 0
* before seeing it.
*/
if (12 < size && !memcmp(line, "\\ No newline", 12))
offset += linelen(line, size);
patch->lines_added += added;
patch->lines_deleted += deleted;
return offset;
@ -900,7 +907,7 @@ static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
* last one (which is the newline, of course).
*/
plen = len-1;
if (len > size && patch[len] == '\\')
if (len < size && patch[len] == '\\')
plen--;
switch (*patch) {
case ' ':

32
t/t4101-apply-nonl.sh Executable file
View file

@ -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