Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-16 01:06:00 +0400
committerJunio C Hamano <gitster@pobox.com>2012-09-16 09:58:20 +0400
commit7e0d4ab585bb8bd4dba722c96e811a02b6c2fdda (patch)
tree5a5b835a743ad8f278198822b6d78148fb6560fb
parentba35480439d05b8f6cca50527072194fe3278bbb (diff)
rerere.c: mark private file-scope symbols as static
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--rerere.c2
-rw-r--r--rerere.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/rerere.c b/rerere.c
index b57a34daa7..a6a5cd57be 100644
--- 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);
diff --git a/rerere.h b/rerere.h
index fcd8bc10ba..156d2aad80 100644
--- 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 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 *);