X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=builtin-apply.c;h=69c8e6a6083456cb3e9c6389d49c7723b8854442;hb=4868f3729acce2aa9512ded7179a895cc50f64c8;hp=4056b9d67bc1c4e50563ceaa0ee68e94873a8e65;hpb=4d548150ace0816dd5fe678cdbde75b13d5e5249;p=git.git

diff --git a/builtin-apply.c b/builtin-apply.c
index 4056b9d6..69c8e6a6 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -1334,6 +1334,7 @@ static int apply_line(char *output, const char *patch, int plen)
 
 static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
 {
+	int match_beginning, match_end;
 	char *buf = desc->buffer;
 	const char *patch = frag->patch;
 	int offset, size = frag->size;
@@ -1396,10 +1397,22 @@ static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
 	newlines = new;
 	leading = frag->leading;
 	trailing = frag->trailing;
+
+	/*
+	 * If we don't have any leading/trailing data in the patch,
+	 * we want it to match at the beginning/end of the file.
+	 */
+	match_beginning = !leading && (frag->oldpos == 1);
+	match_end = !trailing;
+
 	lines = 0;
 	pos = frag->newpos;
 	for (;;) {
 		offset = find_offset(buf, desc->size, oldlines, oldsize, pos, &lines);
+		if (match_end && offset + oldsize != desc->size)
+			offset = -1;
+		if (match_beginning && offset)
+			offset = -1;
 		if (offset >= 0) {
 			int diff = newsize - oldsize;
 			unsigned long size = desc->size + diff;
@@ -1429,6 +1442,10 @@ static int apply_one_fragment(struct buffer_desc *desc, struct fragment *frag)
 		/* Am I at my context limits? */
 		if ((leading <= p_context) && (trailing <= p_context))
 			break;
+		if (match_beginning || match_end) {
+			match_beginning = match_end = 0;
+			continue;
+		}
 		/* Reduce the number of context lines
 		 * Reduce both leading and trailing if they are equal
 		 * otherwise just reduce the larger context.