Merge branch 'es/worktree-add-cleanup'
The "new-worktree-mode" hack in "checkout" that was added in nd/multiple-work-trees topic has been removed by updating the implementation of new "worktree add". * es/worktree-add-cleanup: (25 commits) Documentation/git-worktree: fix duplicated 'from' Documentation/config: mention "now" and "never" for 'expire' settings Documentation/git-worktree: fix broken 'linkgit' invocation checkout: drop intimate knowledge of newly created worktree worktree: populate via "git reset --hard" rather than "git checkout" worktree: avoid resolving HEAD unnecessarily worktree: make setup of new HEAD distinct from worktree population worktree: detect branch-name/detached and error conditions locally worktree: add_worktree: construct worktree-population command locally worktree: elucidate environment variables intended for child processes worktree: make branch creation distinct from worktree population worktree: add: suppress auto-vivication with --detach and no <branch> worktree: make --detach mutually exclusive with -b/-B worktree: introduce options container worktree: simplify new branch (-b/-B) option checking worktree: improve worktree setup message branch: publish die_if_checked_out() checkout: teach check_linked_checkout() about symbolic link HEAD checkout: check_linked_checkout: simplify symref parsing checkout: check_linked_checkout: improve "already checked out" aesthetic ...
This commit is contained in:
Junio C Hamano
commit
53860f0392
@ -1307,20 +1307,24 @@ gc.packRefs::
|
||||
gc.pruneExpire::
|
||||
When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
|
||||
Override the grace period with this config variable. The value
|
||||
"now" may be used to disable this grace period and always prune
|
||||
unreachable objects immediately.
|
||||
"now" may be used to disable this grace period and always prune
|
||||
unreachable objects immediately, or "never" may be used to
|
||||
suppress pruning.
|
||||
|
||||
gc.worktreePruneExpire::
|
||||
When 'git gc' is run, it calls
|
||||
'git worktree prune --expire 3.months.ago'.
|
||||
This config variable can be used to set a different grace
|
||||
period. The value "now" may be used to disable the grace
|
||||
period and prune $GIT_DIR/worktrees immediately.
|
||||
period and prune $GIT_DIR/worktrees immediately, or "never"
|
||||
may be used to suppress pruning.
|
||||
|
||||
gc.reflogExpire::
|
||||
gc.<pattern>.reflogExpire::
|
||||
'git reflog expire' removes reflog entries older than
|
||||
this time; defaults to 90 days. With "<pattern>" (e.g.
|
||||
this time; defaults to 90 days. The value "now" expires all
|
||||
entries immediately, and "never" suppresses expiration
|
||||
altogether. With "<pattern>" (e.g.
|
||||
"refs/stash") in the middle the setting applies only to
|
||||
the refs that match the <pattern>.
|
||||
|
||||
@ -1328,7 +1332,9 @@ gc.reflogExpireUnreachable::
|
||||
gc.<ref>.reflogExpireUnreachable::
|
||||
'git reflog expire' removes reflog entries older than
|
||||
this time and are not reachable from the current tip;
|
||||
defaults to 30 days. With "<pattern>" (e.g. "refs/stash")
|
||||
defaults to 30 days. The value "now" expires all entries
|
||||
immediately, and "never" suppresses expiration altogether.
|
||||
With "<pattern>" (e.g. "refs/stash")
|
||||
in the middle, the setting applies only to the refs that
|
||||
match the <pattern>.
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ bare repository) and zero or more linked working trees.
|
||||
When you are done with a linked working tree you can simply delete it.
|
||||
The working tree's administrative files in the repository (see
|
||||
"DETAILS" below) will eventually be removed automatically (see
|
||||
`gc.worktreePruneExpire` in linkgit::git-config[1]), or you can run
|
||||
`gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run
|
||||
`git worktree prune` in the main or any linked working tree to
|
||||
clean up any stale administrative files.
|
||||
|
||||
@ -51,9 +51,9 @@ Create `<path>` and checkout `<branch>` into it. The new working directory
|
||||
is linked to the current repository, sharing everything except working
|
||||
directory specific files such as HEAD, index, etc.
|
||||
+
|
||||
If `<branch>` is omitted and neither `-b` nor `-B` is used, then, as a
|
||||
convenience, a new branch based at HEAD is created automatically, as if
|
||||
`-b $(basename <path>)` was specified.
|
||||
If `<branch>` is omitted and neither `-b` nor `-B` nor `--detached` used,
|
||||
then, as a convenience, a new branch based at HEAD is created automatically,
|
||||
as if `-b $(basename <path>)` was specified.
|
||||
|
||||
prune::
|
||||
|
||||
@ -124,7 +124,7 @@ thumb is do not make any assumption about whether a path belongs to
|
||||
$GIT_DIR or $GIT_COMMON_DIR when you need to directly access something
|
||||
inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path.
|
||||
|
||||
To prevent a $GIT_DIR/worktrees entry from from being pruned (which
|
||||
To prevent a $GIT_DIR/worktrees entry from being pruned (which
|
||||
can be useful in some situations, such as when the
|
||||
entry's working tree is stored on a portable device), add a file named
|
||||
'locked' to the entry's directory. The file contains the reason in
|
||||
|
||||
67
branch.c
67
branch.c
@ -310,3 +310,70 @@ void remove_branch_state(void)
|
||||
unlink(git_path("MERGE_MODE"));
|
||||
unlink(git_path("SQUASH_MSG"));
|
||||
}
|
||||
|
||||
static void check_linked_checkout(const char *branch, const char *id)
|
||||
{
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
struct strbuf path = STRBUF_INIT;
|
||||
struct strbuf gitdir = STRBUF_INIT;
|
||||
|
||||
/*
|
||||
* $GIT_COMMON_DIR/HEAD is practically outside
|
||||
* $GIT_DIR so resolve_ref_unsafe() won't work (it
|
||||
* uses git_path). Parse the ref ourselves.
|
||||
*/
|
||||
if (id)
|
||||
strbuf_addf(&path, "%s/worktrees/%s/HEAD", get_git_common_dir(), id);
|
||||
else
|
||||
strbuf_addf(&path, "%s/HEAD", get_git_common_dir());
|
||||
|
||||
if (!strbuf_readlink(&sb, path.buf, 0)) {
|
||||
if (!starts_with(sb.buf, "refs/") ||
|
||||
check_refname_format(sb.buf, 0))
|
||||
goto done;
|
||||
} else if (strbuf_read_file(&sb, path.buf, 0) >= 0 &&
|
||||
starts_with(sb.buf, "ref:")) {
|
||||
strbuf_remove(&sb, 0, strlen("ref:"));
|
||||
strbuf_trim(&sb);
|
||||
} else
|
||||
goto done;
|
||||
if (strcmp(sb.buf, branch))
|
||||
goto done;
|
||||
if (id) {
|
||||
strbuf_reset(&path);
|
||||
strbuf_addf(&path, "%s/worktrees/%s/gitdir", get_git_common_dir(), id);
|
||||
if (strbuf_read_file(&gitdir, path.buf, 0) <= 0)
|
||||
goto done;
|
||||
strbuf_rtrim(&gitdir);
|
||||
} else
|
||||
strbuf_addstr(&gitdir, get_git_common_dir());
|
||||
skip_prefix(branch, "refs/heads/", &branch);
|
||||
strbuf_strip_suffix(&gitdir, ".git");
|
||||
die(_("'%s' is already checked out at '%s'"), branch, gitdir.buf);
|
||||
done:
|
||||
strbuf_release(&path);
|
||||
strbuf_release(&sb);
|
||||
strbuf_release(&gitdir);
|
||||
}
|
||||
|
||||
void die_if_checked_out(const char *branch)
|
||||
{
|
||||
struct strbuf path = STRBUF_INIT;
|
||||
DIR *dir;
|
||||
struct dirent *d;
|
||||
|
||||
check_linked_checkout(branch, NULL);
|
||||
|
||||
strbuf_addf(&path, "%s/worktrees", get_git_common_dir());
|
||||
dir = opendir(path.buf);
|
||||
strbuf_release(&path);
|
||||
if (!dir)
|
||||
return;
|
||||
|
||||
while ((d = readdir(dir)) != NULL) {
|
||||
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
|
||||
continue;
|
||||
check_linked_checkout(branch, d->d_name);
|
||||
}
|
||||
closedir(dir);
|
||||
}
|
||||
|
||||
7
branch.h
7
branch.h
@ -52,4 +52,11 @@ extern void install_branch_config(int flag, const char *local, const char *origi
|
||||
*/
|
||||
extern int read_branch_desc(struct strbuf *, const char *branch_name);
|
||||
|
||||
/*
|
||||
* Check if a branch is checked out in the main worktree or any linked
|
||||
* worktree and die (with a message describing its checkout location) if
|
||||
* it is.
|
||||
*/
|
||||
extern void die_if_checked_out(const char *branch);
|
||||
|
||||
#endif
|
||||
|
||||
@ -48,8 +48,6 @@ struct checkout_opts {
|
||||
const char *prefix;
|
||||
struct pathspec pathspec;
|
||||
struct tree *source_tree;
|
||||
|
||||
int new_worktree_mode;
|
||||
};
|
||||
|
||||
static int post_checkout_hook(struct commit *old, struct commit *new,
|
||||
@ -509,7 +507,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
|
||||
topts.dir->flags |= DIR_SHOW_IGNORED;
|
||||
setup_standard_excludes(topts.dir);
|
||||
}
|
||||
tree = parse_tree_indirect(old->commit && !opts->new_worktree_mode ?
|
||||
tree = parse_tree_indirect(old->commit ?
|
||||
old->commit->object.sha1 :
|
||||
EMPTY_TREE_SHA1_BIN);
|
||||
init_tree_desc(&trees[0], tree->buffer, tree->size);
|
||||
@ -830,8 +828,7 @@ static int switch_branches(const struct checkout_opts *opts,
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (!opts->quiet && !old.path && old.commit &&
|
||||
new->commit != old.commit && !opts->new_worktree_mode)
|
||||
if (!opts->quiet && !old.path && old.commit && new->commit != old.commit)
|
||||
orphaned_commit_warning(old.commit, new->commit);
|
||||
|
||||
update_refs_for_switch(opts, &old, new);
|
||||
@ -896,71 +893,6 @@ static const char *unique_tracking_name(const char *name, unsigned char *sha1)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void check_linked_checkout(struct branch_info *new, const char *id)
|
||||
{
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
struct strbuf path = STRBUF_INIT;
|
||||
struct strbuf gitdir = STRBUF_INIT;
|
||||
const char *start, *end;
|
||||
|
||||
if (id)
|
||||
strbuf_addf(&path, "%s/worktrees/%s/HEAD", get_git_common_dir(), id);
|
||||
else
|
||||
strbuf_addf(&path, "%s/HEAD", get_git_common_dir());
|
||||
|
||||
if (strbuf_read_file(&sb, path.buf, 0) < 0 ||
|
||||
!skip_prefix(sb.buf, "ref:", &start))
|
||||
goto done;
|
||||
while (isspace(*start))
|
||||
start++;
|
||||
end = start;
|
||||
while (*end && !isspace(*end))
|
||||
end++;
|
||||
if (strncmp(start, new->path, end - start) || new->path[end - start] != '\0')
|
||||
goto done;
|
||||
if (id) {
|
||||
strbuf_reset(&path);
|
||||
strbuf_addf(&path, "%s/worktrees/%s/gitdir", get_git_common_dir(), id);
|
||||
if (strbuf_read_file(&gitdir, path.buf, 0) <= 0)
|
||||
goto done;
|
||||
strbuf_rtrim(&gitdir);
|
||||
} else
|
||||
strbuf_addstr(&gitdir, get_git_common_dir());
|
||||
die(_("'%s' is already checked out at '%s'"), new->name, gitdir.buf);
|
||||
done:
|
||||
strbuf_release(&path);
|
||||
strbuf_release(&sb);
|
||||
strbuf_release(&gitdir);
|
||||
}
|
||||
|
||||
static void check_linked_checkouts(struct branch_info *new)
|
||||
{
|
||||
struct strbuf path = STRBUF_INIT;
|
||||
DIR *dir;
|
||||
struct dirent *d;
|
||||
|
||||
strbuf_addf(&path, "%s/worktrees", get_git_common_dir());
|
||||
if ((dir = opendir(path.buf)) == NULL) {
|
||||
strbuf_release(&path);
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* $GIT_COMMON_DIR/HEAD is practically outside
|
||||
* $GIT_DIR so resolve_ref_unsafe() won't work (it
|
||||
* uses git_path). Parse the ref ourselves.
|
||||
*/
|
||||
check_linked_checkout(new, NULL);
|
||||
|
||||
while ((d = readdir(dir)) != NULL) {
|
||||
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
|
||||
continue;
|
||||
check_linked_checkout(new, d->d_name);
|
||||
}
|
||||
strbuf_release(&path);
|
||||
closedir(dir);
|
||||
}
|
||||
|
||||
static int parse_branchname_arg(int argc, const char **argv,
|
||||
int dwim_new_local_branch_ok,
|
||||
struct branch_info *new,
|
||||
@ -1168,14 +1100,14 @@ static int checkout_branch(struct checkout_opts *opts,
|
||||
die(_("Cannot switch branch to a non-commit '%s'"),
|
||||
new->name);
|
||||
|
||||
if (new->path && !opts->force_detach && !opts->new_branch) {
|
||||
if (new->path && !opts->force_detach && !opts->new_branch &&
|
||||
!opts->ignore_other_worktrees) {
|
||||
unsigned char sha1[20];
|
||||
int flag;
|
||||
char *head_ref = resolve_refdup("HEAD", 0, sha1, &flag);
|
||||
if (head_ref &&
|
||||
(!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)) &&
|
||||
!opts->ignore_other_worktrees)
|
||||
check_linked_checkouts(new);
|
||||
(!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)))
|
||||
die_if_checked_out(new->path);
|
||||
free(head_ref);
|
||||
}
|
||||
|
||||
@ -1239,8 +1171,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
|
||||
argc = parse_options(argc, argv, prefix, options, checkout_usage,
|
||||
PARSE_OPT_KEEP_DASHDASH);
|
||||
|
||||
opts.new_worktree_mode = getenv("GIT_CHECKOUT_NEW_WORKTREE") != NULL;
|
||||
|
||||
if (conflict_style) {
|
||||
opts.merge = 1; /* implied */
|
||||
git_xmerge_config("merge.conflictstyle", conflict_style, NULL);
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
#include "dir.h"
|
||||
#include "parse-options.h"
|
||||
#include "argv-array.h"
|
||||
#include "branch.h"
|
||||
#include "refs.h"
|
||||
#include "run-command.h"
|
||||
#include "sigchain.h"
|
||||
#include "refs.h"
|
||||
@ -13,6 +15,13 @@ static const char * const worktree_usage[] = {
|
||||
NULL
|
||||
};
|
||||
|
||||
struct add_opts {
|
||||
int force;
|
||||
int detach;
|
||||
const char *new_branch;
|
||||
int force_new_branch;
|
||||
};
|
||||
|
||||
static int show_only;
|
||||
static int verbose;
|
||||
static unsigned long expire;
|
||||
@ -172,19 +181,35 @@ static const char *worktree_basename(const char *path, int *olen)
|
||||
return name;
|
||||
}
|
||||
|
||||
static int add_worktree(const char *path, const char **child_argv)
|
||||
static int add_worktree(const char *path, const char *refname,
|
||||
const struct add_opts *opts)
|
||||
{
|
||||
struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
|
||||
struct strbuf sb = STRBUF_INIT;
|
||||
const char *name;
|
||||
struct stat st;
|
||||
struct child_process cp;
|
||||
struct argv_array child_env = ARGV_ARRAY_INIT;
|
||||
int counter = 0, len, ret;
|
||||
unsigned char rev[20];
|
||||
struct strbuf symref = STRBUF_INIT;
|
||||
struct commit *commit = NULL;
|
||||
|
||||
if (file_exists(path) && !is_empty_dir(path))
|
||||
die(_("'%s' already exists"), path);
|
||||
|
||||
/* is 'refname' a branch or commit? */
|
||||
if (opts->force_new_branch) /* definitely a branch */
|
||||
;
|
||||
else if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) &&
|
||||
ref_exists(symref.buf)) { /* it's a branch */
|
||||
if (!opts->force)
|
||||
die_if_checked_out(symref.buf);
|
||||
} else { /* must be a commit */
|
||||
commit = lookup_commit_reference_by_name(refname);
|
||||
if (!commit)
|
||||
die(_("invalid reference: %s"), refname);
|
||||
}
|
||||
|
||||
name = worktree_basename(path, &len);
|
||||
strbuf_addstr(&sb_repo,
|
||||
git_path("worktrees/%.*s", (int)(path + len - name), name));
|
||||
@ -228,32 +253,40 @@ static int add_worktree(const char *path, const char **child_argv)
|
||||
real_path(get_git_common_dir()), name);
|
||||
/*
|
||||
* This is to keep resolve_ref() happy. We need a valid HEAD
|
||||
* or is_git_directory() will reject the directory. Moreover, HEAD
|
||||
* in the new worktree must resolve to the same value as HEAD in
|
||||
* the current tree since the command invoked to populate the new
|
||||
* worktree will be handed the branch/ref specified by the user.
|
||||
* For instance, if the user asks for the new worktree to be based
|
||||
* at HEAD~5, then the resolved HEAD~5 in the new worktree must
|
||||
* match the resolved HEAD~5 in the current tree in order to match
|
||||
* the user's expectation.
|
||||
* or is_git_directory() will reject the directory. Any value which
|
||||
* looks like an object ID will do since it will be immediately
|
||||
* replaced by the symbolic-ref or update-ref invocation in the new
|
||||
* worktree.
|
||||
*/
|
||||
if (!resolve_ref_unsafe("HEAD", 0, rev, NULL))
|
||||
die(_("unable to resolve HEAD"));
|
||||
strbuf_reset(&sb);
|
||||
strbuf_addf(&sb, "%s/HEAD", sb_repo.buf);
|
||||
write_file(sb.buf, 1, "%s\n", sha1_to_hex(rev));
|
||||
write_file(sb.buf, 1, "0000000000000000000000000000000000000000\n");
|
||||
strbuf_reset(&sb);
|
||||
strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
|
||||
write_file(sb.buf, 1, "../..\n");
|
||||
|
||||
fprintf_ln(stderr, _("Enter %s (identifier %s)"), path, name);
|
||||
fprintf_ln(stderr, _("Preparing %s (identifier %s)"), path, name);
|
||||
|
||||
setenv("GIT_CHECKOUT_NEW_WORKTREE", "1", 1);
|
||||
setenv(GIT_DIR_ENVIRONMENT, sb_git.buf, 1);
|
||||
setenv(GIT_WORK_TREE_ENVIRONMENT, path, 1);
|
||||
argv_array_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf);
|
||||
argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
|
||||
memset(&cp, 0, sizeof(cp));
|
||||
cp.git_cmd = 1;
|
||||
cp.argv = child_argv;
|
||||
|
||||
if (commit)
|
||||
argv_array_pushl(&cp.args, "update-ref", "HEAD",
|
||||
sha1_to_hex(commit->object.sha1), NULL);
|
||||
else
|
||||
argv_array_pushl(&cp.args, "symbolic-ref", "HEAD",
|
||||
symref.buf, NULL);
|
||||
cp.env = child_env.argv;
|
||||
ret = run_command(&cp);
|
||||
if (ret)
|
||||
goto done;
|
||||
|
||||
cp.argv = NULL;
|
||||
argv_array_clear(&cp.args);
|
||||
argv_array_pushl(&cp.args, "reset", "--hard", NULL);
|
||||
cp.env = child_env.argv;
|
||||
ret = run_command(&cp);
|
||||
if (!ret) {
|
||||
is_junk = 0;
|
||||
@ -262,10 +295,13 @@ static int add_worktree(const char *path, const char **child_argv)
|
||||
junk_work_tree = NULL;
|
||||
junk_git_dir = NULL;
|
||||
}
|
||||
done:
|
||||
strbuf_reset(&sb);
|
||||
strbuf_addf(&sb, "%s/locked", sb_repo.buf);
|
||||
unlink_or_warn(sb.buf);
|
||||
argv_array_clear(&child_env);
|
||||
strbuf_release(&sb);
|
||||
strbuf_release(&symref);
|
||||
strbuf_release(&sb_repo);
|
||||
strbuf_release(&sb_git);
|
||||
return ret;
|
||||
@ -273,47 +309,54 @@ static int add_worktree(const char *path, const char **child_argv)
|
||||
|
||||
static int add(int ac, const char **av, const char *prefix)
|
||||
{
|
||||
int force = 0, detach = 0;
|
||||
const char *new_branch = NULL, *new_branch_force = NULL;
|
||||
struct add_opts opts;
|
||||
const char *new_branch_force = NULL;
|
||||
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_STRING('b', NULL, &new_branch, N_("branch"),
|
||||
OPT__FORCE(&opts.force, N_("checkout <branch> even if already checked out in other worktree")),
|
||||
OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
|
||||
N_("create a new branch")),
|
||||
OPT_STRING('B', NULL, &new_branch_force, N_("branch"),
|
||||
N_("create or reset a branch")),
|
||||
OPT_BOOL(0, "detach", &detach, N_("detach HEAD at named commit")),
|
||||
OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")),
|
||||
OPT_END()
|
||||
};
|
||||
|
||||
memset(&opts, 0, sizeof(opts));
|
||||
ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
|
||||
if (new_branch && new_branch_force)
|
||||
die(_("-b and -B are mutually exclusive"));
|
||||
if (!!opts.detach + !!opts.new_branch + !!new_branch_force > 1)
|
||||
die(_("-b, -B, and --detach are mutually exclusive"));
|
||||
if (ac < 1 || ac > 2)
|
||||
usage_with_options(worktree_usage, options);
|
||||
|
||||
path = prefix ? prefix_filename(prefix, strlen(prefix), av[0]) : av[0];
|
||||
branch = ac < 2 ? "HEAD" : av[1];
|
||||
|
||||
if (ac < 2 && !new_branch && !new_branch_force) {
|
||||
opts.force_new_branch = !!new_branch_force;
|
||||
if (opts.force_new_branch)
|
||||
opts.new_branch = new_branch_force;
|
||||
|
||||
if (ac < 2 && !opts.new_branch && !opts.detach) {
|
||||
int n;
|
||||
const char *s = worktree_basename(path, &n);
|
||||
new_branch = xstrndup(s, n);
|
||||
opts.new_branch = xstrndup(s, n);
|
||||
}
|
||||
|
||||
argv_array_push(&cmd, "checkout");
|
||||
if (force)
|
||||
argv_array_push(&cmd, "--ignore-other-worktrees");
|
||||
if (new_branch)
|
||||
argv_array_pushl(&cmd, "-b", new_branch, NULL);
|
||||
if (new_branch_force)
|
||||
argv_array_pushl(&cmd, "-B", new_branch_force, NULL);
|
||||
if (detach)
|
||||
argv_array_push(&cmd, "--detach");
|
||||
argv_array_push(&cmd, branch);
|
||||
if (opts.new_branch) {
|
||||
struct child_process cp;
|
||||
memset(&cp, 0, sizeof(cp));
|
||||
cp.git_cmd = 1;
|
||||
argv_array_push(&cp.args, "branch");
|
||||
if (opts.force_new_branch)
|
||||
argv_array_push(&cp.args, "--force");
|
||||
argv_array_push(&cp.args, opts.new_branch);
|
||||
argv_array_push(&cp.args, branch);
|
||||
if (run_command(&cp))
|
||||
return -1;
|
||||
branch = opts.new_branch;
|
||||
}
|
||||
|
||||
return add_worktree(path, cmd.argv);
|
||||
return add_worktree(path, branch, &opts);
|
||||
}
|
||||
|
||||
int cmd_worktree(int ac, const char **av, const char *prefix)
|
||||
|
||||
@ -83,6 +83,14 @@ test_expect_success 'die the same branch is already checked out' '
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success SYMLINKS 'die the same branch is already checked out (symlink)' '
|
||||
head=$(git -C there rev-parse --git-path HEAD) &&
|
||||
ref=$(git -C there symbolic-ref HEAD) &&
|
||||
rm "$head" &&
|
||||
ln -s "$ref" "$head" &&
|
||||
test_must_fail git -C here checkout newmaster
|
||||
'
|
||||
|
||||
test_expect_success 'not die the same branch is already checked out' '
|
||||
(
|
||||
cd here &&
|
||||
@ -145,6 +153,14 @@ test_expect_success '"add -b" with <branch> omitted' '
|
||||
test_cmp_rev HEAD burble
|
||||
'
|
||||
|
||||
test_expect_success '"add --detach" with <branch> omitted' '
|
||||
git worktree add --detach fishhook &&
|
||||
git rev-parse HEAD >expected &&
|
||||
git -C fishhook rev-parse HEAD >actual &&
|
||||
test_cmp expected actual &&
|
||||
test_must_fail git -C fishhook symbolic-ref HEAD
|
||||
'
|
||||
|
||||
test_expect_success '"add" with <branch> omitted' '
|
||||
git worktree add wiffle/bat &&
|
||||
test_cmp_rev HEAD bat
|
||||
@ -159,4 +175,22 @@ test_expect_success '"add" auto-vivify does not clobber existing branch' '
|
||||
test_path_is_missing precious
|
||||
'
|
||||
|
||||
test_expect_success '"add" no auto-vivify with --detach and <branch> omitted' '
|
||||
git worktree add --detach mish/mash &&
|
||||
test_must_fail git rev-parse mash -- &&
|
||||
test_must_fail git -C mish/mash symbolic-ref HEAD
|
||||
'
|
||||
|
||||
test_expect_success '"add" -b/-B mutually exclusive' '
|
||||
test_must_fail git worktree add -b poodle -B poodle bamboo master
|
||||
'
|
||||
|
||||
test_expect_success '"add" -b/--detach mutually exclusive' '
|
||||
test_must_fail git worktree add -b poodle --detach bamboo master
|
||||
'
|
||||
|
||||
test_expect_success '"add" -B/--detach mutually exclusive' '
|
||||
test_must_fail git worktree add -B poodle --detach bamboo master
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
Loading…
Reference in New Issue
Block a user