From: Nguyễn Thái Ngọc Duy Date: Sun, 30 Nov 2014 08:24:34 +0000 (+0700) Subject: fast-import: use git_path() for accessing .git dir instead of get_git_dir() X-Git-Tag: v2.5.0-rc0~143^2~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aaa26805add2a8dedf00dda94c816b60479381c6;p=thirdparty%2Fgit.git fast-import: use git_path() for accessing .git dir instead of get_git_dir() This allows git_path() to redirect info/fast-import to another place if needed Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/fast-import.c b/fast-import.c index 30181304d6..1b5092378a 100644 --- a/fast-import.c +++ b/fast-import.c @@ -3112,12 +3112,9 @@ static void parse_progress(void) static char* make_fast_import_path(const char *path) { - struct strbuf abs_path = STRBUF_INIT; - if (!relative_marks_paths || is_absolute_path(path)) return xstrdup(path); - strbuf_addf(&abs_path, "%s/info/fast-import/%s", get_git_dir(), path); - return strbuf_detach(&abs_path, NULL); + return xstrdup(git_path("info/fast-import/%s", path)); } static void option_import_marks(const char *marks,