From: Spencer Baugh Date: Sun, 31 May 2015 23:16:29 GMT Subject: [PATCH] checkout: don't check worktrees when not necessary Message-ID: <1433114189-9779-1-git-send-email-sbaugh@catern.com> 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. Signed-off-by: Spencer Baugh --- builtin/checkout.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/checkout.c b/builtin/checkout.c index 2f92328..7039c5c 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1237,6 +1237,7 @@ static int parse_branchname_arg(int argc, const char **argv, char *head_ref = resolve_refdup("HEAD", 0, sha1, &flag); if (head_ref && (!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)) && + !(opts->patch_mode || opts->pathspec.nr) && !opts->ignore_other_worktrees) check_linked_checkouts(new); free(head_ref); -- 2.4.2.339.g77bd3ea