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 <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Nov 30, 2014 at 15:24 UTC
aaa26805add2a8dedf00dda94c816b60479381c6
1 file changed
+1
-4
fast-import.c
+1
-4
@@ -3112,12 +3112,9 @@ static void parse_progress(void)
3112
3113
static char* make_fast_import_path(const char *path)
3114
{
3115
- struct strbuf abs_path = STRBUF_INIT;
3116
-
3115
if (!relative_marks_paths || is_absolute_path(path))
3116
return xstrdup(path);
3119
- strbuf_addf(&abs_path, "%s/info/fast-import/%s", get_git_dir(), path);
3120
- return strbuf_detach(&abs_path, NULL);
3117
+ return xstrdup(git_path("info/fast-import/%s", path));
3118
}
3119
3120
static void option_import_marks(const char *marks,