projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Add -k kill keyword expansion option to git-cvsimport - revised
[git.git]
/
apply.c
diff --git
a/apply.c
b/apply.c
index
c671d9e
..
81607c0
100644
(file)
--- a/
apply.c
+++ b/
apply.c
@@
-563,7
+563,7
@@
static int find_header(char *line, unsigned long size, int *hdrsize, struct patc
struct fragment dummy;
if (parse_fragment_header(line, len, &dummy) < 0)
continue;
struct fragment dummy;
if (parse_fragment_header(line, len, &dummy) < 0)
continue;
- error("patch fragment without header at line %d: %.*s", linenr, len-1, line);
+ error("patch fragment without header at line %d: %.*s", linenr,
(int)
len-1, line);
}
if (size < len + 6)
}
if (size < len + 6)
@@
-968,7
+968,7
@@
static int apply_fragments(struct buffer_desc *desc, struct patch *patch)
while (frag) {
if (apply_one_fragment(desc, frag) < 0)
while (frag) {
if (apply_one_fragment(desc, frag) < 0)
- return error("patch failed: %s:%d", patch->old_name, frag->oldpos);
+ return error("patch failed: %s:%
l
d", patch->old_name, frag->oldpos);
frag = frag->next;
}
return 0;
frag = frag->next;
}
return 0;