Merge branch 'jc/spht'

[git.git] / builtin-apply.c

diff --git a/builtin-apply.c b/builtin-apply.c
index ee3ef60268540ef73402b8a86c7b96bd594828d7..f2e9a332ca0e148366f49b2825ed8826576f1bad 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -692,7 +692,6 @@ static char *git_header_name(char *line, int llen)
                        }
                }
        }
-       return NULL;
 }
 
 /* Verify that we recognize the lines following a git header */
@@ -2064,7 +2063,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)