[PATCH v2 6/6] worktree: simplify prefixing paths
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- May 22, 2016, 09:33 UTC
- Message-ID
- <20160522093356.22389-7-pclouds@gmail.com>
- In-Reply-To
- <20160522093356.22389-1-pclouds@gmail.com>
This also makes slash conversion always happen on Windows (a side effect of prefix_filename). Which is a good thing.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/worktree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c index b53f802..f9dac37 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -337,7 +337,7 @@ static int add(int ac, const char **av, const char *prefix) if (ac < 1 || ac > 2) usage_with_options(worktree_usage, options); - path = prefix ? prefix_filename(prefix, strlen(prefix), av[0]) : av[0]; + path = prefix_filename(prefix, strlen(prefix), av[0]); branch = ac < 2 ? "HEAD" : av[1]; opts.force_new_branch = !!new_branch_force; @@ -467,6 +467,8 @@ int cmd_worktree(int ac, const char **av, const char *prefix) if (ac < 2) usage_with_options(worktree_usage, options); + if (!prefix) + prefix = ""; if (!strcmp(av[1], "add")) return add(ac - 1, av + 1, prefix); if (!strcmp(av[1], "prune"))
-- 2.8.2.524.g6ff3d78