diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-26 15:39:08 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-26 15:39:08 +0900 |
| commit | b80f629f5bcf798a3c9b37651d2369ad555e7382 (patch) | |
| tree | 0a7ed758d7a74b96cb4bb713dbf66f9362a40b22 /fast-import.c | |
| parent | 6cbc478d83b5773d1925869e50bf6067306f4817 (diff) | |
| parent | 16d2676c9ee996208277772fdf81dda212355440 (diff) | |
| download | git-b80f629f5bcf798a3c9b37651d2369ad555e7382.tar.gz git-b80f629f5bcf798a3c9b37651d2369ad555e7382.tar.xz | |
Merge branch 'jk/war-on-git-path'
While handy, "git_path()" is a dangerous function to use as a
callsite that uses it safely one day can be broken by changes
to other code that calls it. Reduction of its use continues.
* jk/war-on-git-path:
am: drop "dir" parameter from am_state_init
replace strbuf_addstr(git_path()) with git_path_buf()
replace xstrdup(git_path(...)) with git_pathdup(...)
use git_path_* helper functions
branch: add edit_description() helper
bisect: add git_path_bisect_terms helper
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index 1ea3a0860..cf58f875b 100644 --- a/fast-import.c +++ b/fast-import.c @@ -3202,7 +3202,7 @@ static char* make_fast_import_path(const char *path) { if (!relative_marks_paths || is_absolute_path(path)) return xstrdup(path); - return xstrdup(git_path("info/fast-import/%s", path)); + return git_pathdup("info/fast-import/%s", path); } static void option_import_marks(const char *marks, |