Browse Source

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>
maint
Nguyễn Thái Ngọc Duy 9 years ago committed by Junio C Hamano
parent
commit
0409e0b6dc
  1. 4
      builtin/worktree.c

4
builtin/worktree.c

@ -337,7 +337,7 @@ static int add(int ac, const char **av, const char *prefix) @@ -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) @@ -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"))

Loading…
Cancel
Save