projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sha1_name: make core.warnambiguousrefs the default.
[git.git]
/
apply.c
diff --git
a/apply.c
b/apply.c
index
c369966
..
179b3bb
100644
(file)
--- a/
apply.c
+++ b/
apply.c
@@
-651,7
+651,7
@@
static int parse_git_header(char *line, int len, unsigned int size, struct patch
len = linelen(line, size);
if (!len || line[len-1] != '\n')
break;
len = linelen(line, size);
if (!len || line[len-1] != '\n')
break;
- for (i = 0; i <
sizeof(optable) / sizeof(optable[0]
); i++) {
+ for (i = 0; i <
ARRAY_SIZE(optable
); i++) {
const struct opentry *p = optable + i;
int oplen = strlen(p->str);
if (len < oplen || memcmp(p->str, line, oplen))
const struct opentry *p = optable + i;
int oplen = strlen(p->str);
if (len < oplen || memcmp(p->str, line, oplen))
@@
-1402,7
+1402,8
@@
static int check_patch(struct patch *patch)
costate.not_new = 0;
costate.refresh_cache = 1;
if (checkout_entry(active_cache[pos],
costate.not_new = 0;
costate.refresh_cache = 1;
if (checkout_entry(active_cache[pos],
- &costate) ||
+ &costate,
+ NULL) ||
lstat(old_name, &st))
return -1;
}
lstat(old_name, &st))
return -1;
}