diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-05-22 16:33:56 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-24 13:19:23 -0700 |
| commit | 0409e0b6dc169b07c05d02e8b62389b1cc975a45 (patch) | |
| tree | 9ffb26b42f74a1735d60f1011d66ff985833fc26 | |
| parent | ef23c347cf363118e236ae72fe6372443fae1ecf (diff) | |
| download | git-0409e0b6dc169b07c05d02e8b62389b1cc975a45.tar.gz git-0409e0b6dc169b07c05d02e8b62389b1cc975a45.tar.xz | |
worktree: simplify prefixing paths
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>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/worktree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c index b53f8024f..f9dac376f 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")) |