summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-29 06:00:50 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-29 06:00:50 (GMT)
commitcd01d9445de1bbca8952c7ee16941f5fa10747f5 (patch)
tree3f2b68cc47981ca22be62a7f077e3727692e3195 /builtin-apply.c
parent3f69d405d749742945afd462bff6541604ecd420 (diff)
parent4868f3729acce2aa9512ded7179a895cc50f64c8 (diff)
downloadgit-cd01d9445de1bbca8952c7ee16941f5fa10747f5.zip
git-cd01d9445de1bbca8952c7ee16941f5fa10747f5.tar.gz
git-cd01d9445de1bbca8952c7ee16941f5fa10747f5.tar.bz2
Merge branch 'lt/apply'
* lt/apply: apply: force matching at the beginning. Add a test-case for git-apply trying to add an ending line apply: treat EOF as proper context.
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index f16c753..6a4fb96 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -1335,6 +1335,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;
@@ -1397,10 +1398,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;
@@ -1430,6 +1443,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.