diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-03-25 13:57:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-25 13:57:43 -0700 |
| commit | 4d0e8996ec54e53149c2f24075eb64921ca61812 (patch) | |
| tree | 32333cbbf2a91ed8708ceda7e8ce998ccb369fc2 /cache.h | |
| parent | Merge branch 'sg/commit-slab-clarify-peek' (diff) | |
| parent | get_superproject_working_tree(): return strbuf (diff) | |
| download | tgif-4d0e8996ec54e53149c2f24075eb64921ca61812.tar.xz | |
Merge branch 'am/real-path-fix'
The real_path() convenience function can easily be misused; with a
bit of code refactoring in the callers' side, its use has been
eliminated.
* am/real-path-fix:
get_superproject_working_tree(): return strbuf
real_path_if_valid(): remove unsafe API
real_path: remove unsafe API
set_git_dir: fix crash when used with real_path()
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -543,7 +543,7 @@ const char *get_git_common_dir(void); char *get_object_directory(void); char *get_index_file(void); char *get_graft_file(struct repository *r); -void set_git_dir(const char *path); +void set_git_dir(const char *path, int make_realpath); int get_common_dir_noenv(struct strbuf *sb, const char *gitdir); int get_common_dir(struct strbuf *sb, const char *gitdir); const char *get_git_namespace(void); @@ -1314,8 +1314,6 @@ static inline int is_absolute_path(const char *path) int is_directory(const char *); char *strbuf_realpath(struct strbuf *resolved, const char *path, int die_on_error); -const char *real_path(const char *path); -const char *real_path_if_valid(const char *path); char *real_pathdup(const char *path, int die_on_error); const char *absolute_path(const char *path); char *absolute_pathdup(const char *path); |