From: Nguyễn Thái Ngọc Duy Date: Wed, 09 Jul 2014 07:32:56 GMT Subject: [PATCH v6 11/32] fast-import: use git_path() for accessing .git dir instead of get_git_dir() Message-ID: <1404891197-18067-12-git-send-email-pclouds@gmail.com> In-Reply-To: <1404891197-18067-1-git-send-email-pclouds@gmail.com> This allows git_path() to redirect info/fast-import to another place if needed Signed-off-by: Nguyễn Thái Ngọc Duy --- fast-import.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fast-import.c b/fast-import.c index c74ea15..e8ec34d 100644 --- a/fast-import.c +++ b/fast-import.c @@ -3123,12 +3123,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, -- 1.9.1.346.ga2b5940