diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2015-06-12 17:49:24 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-06-12 15:21:44 -0700 |
| commit | e1c1ab9d25864e8de0009f3f3149ec4386a14bf8 (patch) | |
| tree | 177fac85096a1693a29b6478416e38221de4a8fb /builtin/checkout.c | |
| parent | prune --worktrees: fix expire vs worktree existence condition (diff) | |
| download | tgif-e1c1ab9d25864e8de0009f3f3149ec4386a14bf8.tar.xz | |
checkout: don't check worktrees when not necessary
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>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 8b2bf2093b..2079aa4170 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1085,7 +1085,6 @@ static int parse_branchname_arg(int argc, const char **argv, { struct tree **source_tree = &opts->source_tree; const char **new_branch = &opts->new_branch; - int force_detach = opts->force_detach; int argcount = 0; unsigned char branch_rev[20]; const char *arg; @@ -1206,17 +1205,6 @@ static int parse_branchname_arg(int argc, const char **argv, else 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); if (!new->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'"), 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) return prepare_linked_checkout(opts, new); |