Merge branch 'sz/maint-submodule-reference-arg'

diff --git a/rerere.c b/rerere.c
index b57a34daa718a5ecf9750d3068a8ecee4f3e261f..a6a5cd57bef4aaf204f1bad293c18b5af6f57f53 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -25,7 +25,7 @@ const char *rerere_path(const char *hex, const char *file)
        return git_path("rr-cache/%s/%s", hex, file);
 }
 
-int has_rerere_resolution(const char *hex)
+static int has_rerere_resolution(const char *hex)
 {
        struct stat st;
        return !stat(rerere_path(hex, "postimage"), &st);