Merge branch 'es/name-hash-no-trailing-slash-in-dirs'

diff --git a/cache.h b/cache.h
index 038afe128e56a917f1b5e09d78e506b1831a0425..2d86b695a9fbf6828375e0818aaf503a9e46a427 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -884,7 +884,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);