X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-apply.c;h=91f8752ff7fdb588e64f594519a2e9503c516630;hb=5d3d1cacc139194672a6a184509bb620a19b2497;hp=05c6bc3592e98958a4629ab856be33adc9ace33c;hpb=317efa63fc457d1a726902ddf97298c201df627c;p=git.git

diff --git a/builtin-apply.c b/builtin-apply.c
index 05c6bc359..91f8752ff 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -152,7 +152,7 @@ struct patch {
 	unsigned int is_rename:1;
 	struct fragment *fragments;
 	char *result;
-	unsigned long resultsize;
+	size_t resultsize;
 	char old_sha1_prefix[41];
 	char new_sha1_prefix[41];
 	struct patch *next;
@@ -683,7 +683,6 @@ static char *git_header_name(char *line, int llen)
 			}
 		}
 	}
-	return NULL;
 }
 
 /* Verify that we recognize the lines following a git header */
@@ -1993,7 +1992,7 @@ static int verify_index_match(struct cache_entry *ce, struct stat *st)
 			return -1;
 		return 0;
 	}
-	return ce_match_stat(ce, st, 1);
+	return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID);
 }
 
 static int check_patch(struct patch *patch, struct patch *prev_patch)