development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

checkout: don't check worktrees when not necessary

Browse source 
When --patch or pathspecs are passed to git checkout, the working tree
will not be switching branch, so there's no need to check if the branch
that we are running checkout on is already checked out.

Original-patch-by: Spencer Baugh <sbaugh@catern.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2015-06-12 17:49:24 +07:00 committed by Junio C Hamano
parent 562bc08093
commit e1c1ab9d25
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
builtin/checkout.c
View file

@ -1085,7 +1085,6 @@ static int parse_branchname_arg(int argc, const char **argv,
{ {
struct tree **source_tree = &opts->source_tree; struct tree **source_tree = &opts->source_tree;
const char **new_branch = &opts->new_branch; const char **new_branch = &opts->new_branch;
int force_detach = opts->force_detach;
int argcount = 0; int argcount = 0;
unsigned char branch_rev[20]; unsigned char branch_rev[20];
const char *arg; const char *arg;
@ -1206,17 +1205,6 @@ static int parse_branchname_arg(int argc, const char **argv,
else else
new->path = NULL; /* not an existing branch */ new->path = NULL; /* not an existing branch */
if (new->path && !force_detach && !*new_branch) {
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);
free(head_ref);
}
new->commit = lookup_commit_reference_gently(rev, 1); new->commit = lookup_commit_reference_gently(rev, 1);
if (!new->commit) { if (!new->commit) {
/* not a commit */ /* not a commit */
@ -1296,6 +1284,17 @@ static int checkout_branch(struct checkout_opts *opts,
die(_("Cannot switch branch to a non-commit '%s'"), die(_("Cannot switch branch to a non-commit '%s'"),
new->name); new->name);
if (new->path && !opts->force_detach && !opts->new_branch) {
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);
free(head_ref);
}
if (opts->new_worktree) if (opts->new_worktree)
return prepare_linked_checkout(opts, new); return prepare_linked_checkout(opts, new);

8
t/t2025-checkout-to.sh
View file

@ -28,6 +28,14 @@ test_expect_success 'checkout --to refuses to checkout locked branch' '
! test -d .git/worktrees/zere ! test -d .git/worktrees/zere
' '
test_expect_success 'checking out paths not complaining about linked checkouts' '
(
cd existing_empty &&
echo dirty >>init.t &&
git checkout master -- init.t
)
'
test_expect_success 'checkout --to a new worktree' ' test_expect_success 'checkout --to a new worktree' '
git rev-parse HEAD >expect && git rev-parse HEAD >expect &&
git checkout --detach --to here master && git checkout --detach --to here master &&