summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-11-30 15:24:34 +0700
committerJunio C Hamano <gitster@pobox.com>2014-12-01 11:00:12 -0800
commitaaa26805add2a8dedf00dda94c816b60479381c6 (patch)
tree32cbaf0e63a3b8384ed5618e93d255bdc22343e7 /fast-import.c
parent1fdc2abf1b09e2c6971b189a8a36430a34c280b6 (diff)
downloadgit-aaa26805add2a8dedf00dda94c816b60479381c6.tar.gz
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>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c5
1 files changed, 1 insertions, 4 deletions
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,