X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-apply.c;h=91f8752ff7fdb588e64f594519a2e9503c516630;hb=b52e985a4f824128d01220473b04057a4876060d;hp=8411b38c7963852bffeb6dea1494399e8c9daa02;hpb=071a8877662974f588dfc0b1ac7df2764b7e0337;p=git.git

diff --git a/builtin-apply.c b/builtin-apply.c
index 8411b38c7..91f8752ff 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -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)