fast-import: use git_path() for accessing .git dir instead of get_git_dir()

pclouds · gitster · commit aaa26805add2 · 2014-12-01T11:00:12.000-08:00
This allows git_path() to redirect info/fast-import to another place
if needed

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -3112,12 +3112,9 @@ static void parse_progress(void)`
`3112`	`3112`
`3113`	`3113`	`static char* make_fast_import_path(const char *path)`
`3114`	`3114`	`{`
`3115`		`- struct strbuf abs_path = STRBUF_INIT;`
`3116`		`-`
`3117`	`3115`	`if (!relative_marks_paths \|\| is_absolute_path(path))`
`3118`	`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));`
`3121`	`3118`	`}`
`3122`	`3119`
`3123`	`3120`	`static void option_import_marks(const char *marks,`