X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=apply.c;h=244718ca13aa58567974ea3b72d58c0365cc3c21;hb=4d569a2c422a9655390e7d33cad0bab88379f13d;hp=2ad47fbbb37b245a78abd8e8255d39b39a52f9a9;hpb=2d310d8a018ca1a8d3e4c8a52f60ae5f57f34b31;p=git.git

diff --git a/apply.c b/apply.c
index 2ad47fbb..244718ca 100644
--- a/apply.c
+++ b/apply.c
@@ -1142,6 +1142,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;
@@ -1309,7 +1317,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);