mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

worktree: add --detach option

Browse Source 
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>
This commit is contained in:
Eric Sunshine
2015-07-06 13:30:52 -04:00
committed by Junio C Hamano
parent f43254440d
commit 39ecb27436
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-worktree.txt
View File

@ -9,7 +9,7 @@ git-worktree - Manage multiple worktrees
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'git worktree add' [-f] <path> <branch> 'git worktree add' [-f] [--detach] <path> <branch>
'git worktree prune' [-n] [-v] [--expire <expire>] 'git worktree prune' [-n] [-v] [--expire <expire>]
DESCRIPTION DESCRIPTION
@ -64,6 +64,10 @@ OPTIONS
is already checked out by another worktree. This option overrides is already checked out by another worktree. This option overrides
that safeguard. that safeguard.
--detach::
With `add`, detach HEAD in the new worktree. See "DETACHED HEAD" in
linkgit:git-checkout[1].
-n:: -n::
--dry-run:: --dry-run::
With `prune`, do not remove anything; just report what it would With `prune`, do not remove anything; just report what it would

5
builtin/worktree.c
View File

@ -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) static int add(int ac, const char **av, const char *prefix)
{ {
struct child_process c; struct child_process c;
int force = 0; int force = 0, detach = 0;
const char *path, *branch; const char *path, *branch;
struct argv_array cmd = ARGV_ARRAY_INIT; struct argv_array cmd = ARGV_ARRAY_INIT;
struct option options[] = { struct option options[] = {
OPT__FORCE(&force, N_("checkout <branch> even if already checked out in other worktree")), 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() OPT_END()
}; };
@ -144,6 +145,8 @@ static int add(int ac, const char **av, const char *prefix)
argv_array_pushl(&cmd, "--to", path, NULL); argv_array_pushl(&cmd, "--to", path, NULL);
if (force) if (force)
argv_array_push(&cmd, "--ignore-other-worktrees"); argv_array_push(&cmd, "--ignore-other-worktrees");
if (detach)
argv_array_push(&cmd, "--detach");
argv_array_push(&cmd, branch); argv_array_push(&cmd, branch);
memset(&c, 0, sizeof(c)); memset(&c, 0, sizeof(c));