mirror of
https://github.com/git/git
synced 2024-10-12 11:32:34 +00:00
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>
This commit is contained in:
parent
ef23c347cf
commit
0409e0b6dc
|
@ -337,7 +337,7 @@ static int add(int ac, const char **av, const char *prefix)
|
||||||
if (ac < 1 || ac > 2)
|
if (ac < 1 || ac > 2)
|
||||||
usage_with_options(worktree_usage, options);
|
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];
|
branch = ac < 2 ? "HEAD" : av[1];
|
||||||
|
|
||||||
opts.force_new_branch = !!new_branch_force;
|
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)
|
if (ac < 2)
|
||||||
usage_with_options(worktree_usage, options);
|
usage_with_options(worktree_usage, options);
|
||||||
|
if (!prefix)
|
||||||
|
prefix = "";
|
||||||
if (!strcmp(av[1], "add"))
|
if (!strcmp(av[1], "add"))
|
||||||
return add(ac - 1, av + 1, prefix);
|
return add(ac - 1, av + 1, prefix);
|
||||||
if (!strcmp(av[1], "prune"))
|
if (!strcmp(av[1], "prune"))
|
||||||
|
|
Loading…
Reference in a new issue