Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
fast-import: use git_path() for accessing .git dir instead of get_git_dir()
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Sun, 30 Nov 2014 08:24:34 +0000
(15:24 +0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 1 Dec 2014 19:00:12 +0000
(11:00 -0800)
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>
fast-import.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
1fdc2ab
)
diff --git
a/fast-import.c
b/fast-import.c
index 30181304d66100a8d0bc09579d6f8e9bca749a95..1b5092378a66d6f9d344385741bd5a2e03a9eaa5 100644
(file)
--- 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,