summaryrefslogtreecommitdiff
path: root/builtin/worktree.c
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2015-07-06 17:30:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-06 18:07:46 (GMT)
commitf43254440d56da1fd52216cbebd5c285b20985e6 (patch)
treee1bcf94692dad2c2ba6bdc820963e8e8efab32b2 /builtin/worktree.c
parentfc56361f58a20f1259e1ba2364424ec27825c37f (diff)
downloadgit-f43254440d56da1fd52216cbebd5c285b20985e6.zip
git-f43254440d56da1fd52216cbebd5c285b20985e6.tar.gz
git-f43254440d56da1fd52216cbebd5c285b20985e6.tar.bz2
worktree: add --force option
By default, "git worktree add" refuses to create a new worktree when the requested branch is already checked out elsewhere. Add a --force option to override this safeguard. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/worktree.c')
-rw-r--r--builtin/worktree.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c
index e0749c0..8c35023 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -6,7 +6,7 @@
#include "run-command.h"
static const char * const worktree_usage[] = {
- N_("git worktree add <path> <branch>"),
+ N_("git worktree add [<options>] <path> <branch>"),
N_("git worktree prune [<options>]"),
NULL
};
@@ -125,9 +125,11 @@ static int prune(int ac, const char **av, const char *prefix)
static int add(int ac, const char **av, const char *prefix)
{
struct child_process c;
+ int force = 0;
const char *path, *branch;
struct argv_array cmd = ARGV_ARRAY_INIT;
struct option options[] = {
+ OPT__FORCE(&force, N_("checkout <branch> even if already checked out in other worktree")),
OPT_END()
};
@@ -140,6 +142,8 @@ static int add(int ac, const char **av, const char *prefix)
argv_array_push(&cmd, "checkout");
argv_array_pushl(&cmd, "--to", path, NULL);
+ if (force)
+ argv_array_push(&cmd, "--ignore-other-worktrees");
argv_array_push(&cmd, branch);
memset(&c, 0, sizeof(c));