diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:13:10 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:13:10 -0700 |
commit | 3830759c1c91726a97adb2e97e2de08aec60f25a (patch) | |
tree | 565ce768813ae1c98438dada58f8fc7958630e52 | |
parent | Merge branch 'rs/t1002-do-not-use-sum' (diff) | |
parent | sha1_file: make read_info_alternates static (diff) | |
download | tgif-3830759c1c91726a97adb2e97e2de08aec60f25a.tar.xz |
Merge branch 'sb/sha1-file-cleanup'
Code clean-up.
* sb/sha1-file-cleanup:
sha1_file: make read_info_alternates static
-rw-r--r-- | cache.h | 1 | ||||
-rw-r--r-- | sha1_file.c | 3 |
2 files changed, 2 insertions, 2 deletions
@@ -1544,7 +1544,6 @@ extern struct alternate_object_database { char path[FLEX_ARRAY]; } *alt_odb_list; extern void prepare_alt_odb(void); -extern void read_info_alternates(const char * relative_base, int depth); extern char *compute_alternate_path(const char *path, struct strbuf *err); typedef int alt_odb_fn(struct alternate_object_database *, void *); extern int foreach_alt_odb(alt_odb_fn, void*); diff --git a/sha1_file.c b/sha1_file.c index 79feb1a305..189a1c3cdd 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -347,6 +347,7 @@ static int alt_odb_usable(struct strbuf *path, const char *normalized_objdir) * SHA1, an extra slash for the first level indirection, and the * terminating NUL. */ +static void read_info_alternates(const char * relative_base, int depth); static int link_alt_odb_entry(const char *entry, const char *relative_base, int depth, const char *normalized_objdir) { @@ -448,7 +449,7 @@ static void link_alt_odb_entries(const char *alt, int len, int sep, strbuf_release(&objdirbuf); } -void read_info_alternates(const char * relative_base, int depth) +static void read_info_alternates(const char * relative_base, int depth) { char *map; size_t mapsz; |