Merge branch 'jk/shortlog-tolerate-broken-commit'

diff --git a/cache.h b/cache.h
index a47b9c03036d41e8067a843dda305bc9b6161255..51d6602cd9da8f8da6b5176ea352574bcc7036f5 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -880,7 +880,7 @@ extern char *resolve_refdup(const char *ref, unsigned char *sha1, int reading, i
 
 extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
 extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
-extern int interpret_branch_name(const char *str, struct strbuf *);
+extern int interpret_branch_name(const char *str, int len, struct strbuf *);
 extern int get_sha1_mb(const char *str, unsigned char *sha1);
 
 extern int refname_match(const char *abbrev_name, const char *full_name, const char **rules);