From: Nguyễn Thái Ngọc Duy Date: Wed, 13 Apr 2016 13:15:41 GMT Subject: [PATCH 20/25] worktree: simplify prefixing paths Message-ID: <1460553346-12985-21-git-send-email-pclouds@gmail.com> In-Reply-To: <1460553346-12985-1-git-send-email-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index e041d7f..a9e91ab 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -330,7 +330,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; @@ -460,6 +460,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.0.rc0.210.gd302cd2