[PATCH v2 06/21] fast-import: use git_path() for accessing .git dir instead of get_git_dir()

From

Nguyễn Thái Ngọc Duy <pclouds@gmail.com>

Date

Dec 14, 2013, 10:54 UTC

Message-ID

<1387018507-21999-7-git-send-email-pclouds@gmail.com>

In-Reply-To

<1387018507-21999-1-git-send-email-pclouds@gmail.com>

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 fast-import.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/fast-import.c b/fast-import.c
index f4d9969..04bba3d 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -3125,12 +3125,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.8.5.1.77.g42c48fa