summaryrefslogtreecommitdiff
path: root/builtin/worktree.c
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2015-07-06 17:30:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-06 18:07:46 (GMT)
commit39ecb27436296361371d3caadcc9bc4a4e0b556d (patch)
treef750a01755147376c96398a3bc3acf91b2ffe6f7 /builtin/worktree.c
parentf43254440d56da1fd52216cbebd5c285b20985e6 (diff)
downloadgit-39ecb27436296361371d3caadcc9bc4a4e0b556d.zip
git-39ecb27436296361371d3caadcc9bc4a4e0b556d.tar.gz
git-39ecb27436296361371d3caadcc9bc4a4e0b556d.tar.bz2
worktree: add --detach option
One of git-worktree's roles is to populate the new worktree, much like git-checkout, and thus, for convenience, ought to support several of the same shortcuts. Toward this goal, add a --detach option to detach HEAD in the new worktree. 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.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 8c35023..9dc92b0 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -125,11 +125,12 @@ 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;
+ int force = 0, detach = 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_BOOL(0, "detach", &detach, N_("detach HEAD at named commit")),
OPT_END()
};
@@ -144,6 +145,8 @@ static int add(int ac, const char **av, const char *prefix)
argv_array_pushl(&cmd, "--to", path, NULL);
if (force)
argv_array_push(&cmd, "--ignore-other-worktrees");
+ if (detach)
+ argv_array_push(&cmd, "--detach");
argv_array_push(&cmd, branch);
memset(&c, 0, sizeof(c));