rerere.c: mark private file-scope symbols as static

Signed-off-by: Junio C Hamano <gitster@pobox.com>

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);
 }
 
        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);
 {
        struct stat st;
        return !stat(rerere_path(hex, "postimage"), &st);

diff --git a/rerere.h b/rerere.h
index fcd8bc10ba587d023d174d68020a185eab0f8d40..156d2aad804527d5ae766b5381f3b5e0d2176580 100644 (file)
--- a/rerere.h
+++ b/rerere.h
@@ -16,7 +16,6 @@ extern void *RERERE_RESOLVED;
 extern int setup_rerere(struct string_list *, int);
 extern int rerere(int);
 extern const char *rerere_path(const char *hex, const char *file);
 extern int setup_rerere(struct string_list *, int);
 extern int rerere(int);
 extern const char *rerere_path(const char *hex, const char *file);

-extern int has_rerere_resolution(const char *hex);

 extern int rerere_forget(const char **);
 extern int rerere_remaining(struct string_list *);
 extern void rerere_clear(struct string_list *);
 extern int rerere_forget(const char **);
 extern int rerere_remaining(struct string_list *);
 extern void rerere_clear(struct string_list *);