X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=builtin-apply.c;h=8edcc08b61e6ab41098154afe1f6741f987978d7;hb=549799b4a1741fe765fff2c91808b4524ea2d7fb;hp=05c6bc3592e98958a4629ab856be33adc9ace33c;hpb=6e863d6d129a1b6a13c66d0bb03f3d43db6c51fe;p=git.git

diff --git a/builtin-apply.c b/builtin-apply.c
index 05c6bc359..8edcc08b6 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;
@@ -1993,7 +1993,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)