X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=apply.c;h=9deb206faa5259e4f4f0a458ddc14dd4762da10b;hb=38fd0721d0a2a1a723bc28fc0817e3571987b1ef;hp=453482a035d76a14b04fa4182694a3d46db083e7;hpb=e1a0c8b1483b38d32d3870408e03a6c1b340aa15;p=git.git

diff --git a/apply.c b/apply.c
index 453482a0..9deb206f 100644
--- a/apply.c
+++ b/apply.c
@@ -1232,6 +1232,14 @@ static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
 		size -= len;
 	}
 
+#ifdef NO_ACCURATE_DIFF
+	if (oldsize > 0 && old[oldsize - 1] == '\n' &&
+			newsize > 0 && new[newsize - 1] == '\n') {
+		oldsize--;
+		newsize--;
+	}
+#endif
+			
 	offset = find_offset(buf, desc->size, old, oldsize, frag->newpos);
 	if (offset >= 0) {
 		int diff = newsize - oldsize;
@@ -1399,7 +1407,7 @@ static int check_patch(struct patch *patch)
 					return -1;
 			}
 
-			changed = ce_match_stat(active_cache[pos], &st);
+			changed = ce_match_stat(active_cache[pos], &st, 1);
 			if (changed)
 				return error("%s: does not match index",
 					     old_name);