Skip to content

Commit

Permalink
worktree: add --detach option
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Sunshine authored and Junio C Hamano committed Jul 6, 2015
1 parent f432544 commit 39ecb27
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
6 changes: 5 additions & 1 deletion Documentation/git-worktree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ git-worktree - Manage multiple worktrees
SYNOPSIS
--------
[verse]
'git worktree add' [-f] <path> <branch>
'git worktree add' [-f] [--detach] <path> <branch>
'git worktree prune' [-n] [-v] [--expire <expire>]

DESCRIPTION
Expand Down Expand Up @@ -64,6 +64,10 @@ OPTIONS
is already checked out by another worktree. This option overrides
that safeguard.

--detach::
With `add`, detach HEAD in the new worktree. See "DETACHED HEAD" in
linkgit:git-checkout[1].

-n::
--dry-run::
With `prune`, do not remove anything; just report what it would
Expand Down
5 changes: 4 additions & 1 deletion builtin/worktree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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()
};

Expand All @@ -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));
Expand Down

0 comments on commit 39ecb27

Please sign in to comment.