repository.c: free the "path cache" in repo_clear()
The "struct path_cache" added in 102de880d2 (path.c: migrate global
git_path_* to take a repository argument, 2018-05-17) is only used
directly by code in repository.[ch] (but populated in path.[ch]).
Let's move this code to repository.[ch], and stop leaking this memory
when we run repo_clear(). To avoid the cast change it from a "const
char *" to a "char *".
This also removes the "PATH_CACHE_INIT" macro, which has never been
used for anything. For the "struct repository" we already make a hard
assumption that it (and "the_repository") can be identically
initialized by making it a "static" variable, so making use of a
"PATH_CACHE_INIT" somewhere would have been confusing.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
2d102c2bca
commit
759f340738
14
path.h
14
path.h
@ -169,20 +169,6 @@ void report_linked_checkout_garbage(void);
|
||||
return r->cached_paths.var; \
|
||||
}
|
||||
|
||||
struct path_cache {
|
||||
const char *squash_msg;
|
||||
const char *merge_msg;
|
||||
const char *merge_rr;
|
||||
const char *merge_mode;
|
||||
const char *merge_head;
|
||||
const char *merge_autostash;
|
||||
const char *auto_merge;
|
||||
const char *fetch_head;
|
||||
const char *shallow;
|
||||
};
|
||||
|
||||
#define PATH_CACHE_INIT { 0 }
|
||||
|
||||
const char *git_path_squash_msg(struct repository *r);
|
||||
const char *git_path_merge_msg(struct repository *r);
|
||||
const char *git_path_merge_rr(struct repository *r);
|
||||
|
||||
Reference in New Issue
Block a user