Skip to content

worktree add: shouldn't dwim if -b or -B is given #2192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yoichi wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −10
Open

worktree add: shouldn't dwim if -b or -B is given #2192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions builtin/worktree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,16 +898,18 @@ static int add(int ac, const char **av, const char *prefix,
/* DWIM: Infer --orphan when repo has no refs. */
opts.orphan = (!s) && dwim_orphan(&opts, !!opt_track, 1);
} else if (ac == 2) {
struct object_id oid;
struct commit *commit;
char *remote;

commit = lookup_commit_reference_by_name(branch);
if (!commit) {
remote = unique_tracking_name(branch, &oid, NULL);
if (remote) {
new_branch = branch;
branch = new_branch_to_free = remote;
if (!new_branch) {
struct object_id oid;
struct commit *commit;
char *remote;

commit = lookup_commit_reference_by_name(branch);
if (!commit) {
remote = unique_tracking_name(branch, &oid, NULL);
if (remote) {
new_branch = branch;
branch = new_branch_to_free = remote;
}
}
}

Expand Down
10 changes: 10 additions & 0 deletions t/t2400-worktree-add.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,16 @@ test_expect_success '"add" <path> <branch> dwims' '
)
'

test_expect_success '"add" <path> <branch> does not dwim with -b' '
test_when_finished rm -rf repo_upstream repo_dwim wt &&
setup_remote_repo repo_upstream repo_dwim &&
(
cd repo_dwim &&
test_must_fail git worktree add -b branch ../wt foo 2>actual &&
test_grep "^fatal: invalid reference: foo" actual
)
'

test_expect_success '"add" <path> <branch> dwims with checkout.defaultRemote' '
test_when_finished rm -rf repo_upstream repo_dwim foo &&
setup_remote_repo repo_upstream repo_dwim &&
Expand Down
Loading