[PATCH v7 09/31] 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
- Jul 13, 2014, 04:50 UTC
- Message-ID
- <1405227068-25506-10-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1405227068-25506-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 <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 d9c068b..ea426c4 100644 --- a/fast-import.c +++ b/fast-import.c @@ -3103,12 +3103,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