From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Sunshine Subject: [PATCH v3 18/22] worktree: detect branch-name/detached and error conditions locally Date: Fri, 17 Jul 2015 19:00:13 -0400 Message-ID: <1437174017-81687-19-git-send-email-sunshine@sunshineco.com> References: <1437174017-81687-1-git-send-email-sunshine@sunshineco.com> Cc: Junio C Hamano , Duy Nguyen , Michael J Gruber , Eric Sunshine To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Jul 18 01:01:53 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZGEdd-0002Wq-2O for gcvg-git-2@plane.gmane.org; Sat, 18 Jul 2015 01:01:53 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754006AbbGQXBr (ORCPT ); Fri, 17 Jul 2015 19:01:47 -0400 Received: from mail-ig0-f175.google.com ([209.85.213.175]:38811 "EHLO mail-ig0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754020AbbGQXB3 (ORCPT ); Fri, 17 Jul 2015 19:01:29 -0400 Received: by iggf3 with SMTP id f3so47296556igg.1 for ; Fri, 17 Jul 2015 16:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Fmf8ED66WMY+uVxU6SeEWpXm7W8CstXr5yR7Dvzb5tM=; b=CnPjiqWelq9pbf/zLenYjop8uDcm3lU94clFPXiy78rPOINWrGSeAZDYrLMnyFzmZ+ 0CEb8QAt67/QmRTgXPzL6bMMRLZkbTFVGbiemuvVd/ZE01nuW8XTeCn8Adq/TNTzUKFd k++KkKAPZYA6vslWvaFKrlfnQwDf2FD0JjgatLoawFZ95eFGdGXUBmSAjP9Cjqsho+8L 7BqNQpk1ktL3RxE73uR9eNx1AkIUTeXC6ed2RUxY/F3W4ryqdUVBGKhxIpxgQe0ZxeZ0 62n7QPfehBMp4Ryi+w/2ZD+dG6CISAo5AIKlerlDx1+GH9DaHGQXDr61IlFlO/vjLcfI xTFA== X-Received: by 10.50.33.18 with SMTP id n18mr967249igi.26.1437174089233; Fri, 17 Jul 2015 16:01:29 -0700 (PDT) Received: from localhost.localdomain (user-12l3cpl.cable.mindspring.com. [69.81.179.53]) by smtp.gmail.com with ESMTPSA id 140sm8414824ion.16.2015.07.17.16.01.28 (version=TLSv1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Jul 2015 16:01:28 -0700 (PDT) X-Mailer: git-send-email 2.5.0.rc2.378.g0af52e8 In-Reply-To: <1437174017-81687-1-git-send-email-sunshine@sunshineco.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: git-worktree currently conflates setting of HEAD in the new worktree with initial worktree population via a single git-checkout invocation, which requires git-checkout to have special knowledge that it is operating in a newly created worktree. The eventual goal is to separate these operations and rid git-checkout of that overly-intimate knowledge. Once these operations are separate, git-worktree will no longer be able to rely upon git-branch to determine the state of the worktree (branch name or detached), or to check for error conditions, such as the requested branch already checked out elsewhere, or an invalid reference. Therefore, imbue git-worktree with the intelligence to determine a branch name or detached state locally, and to perform error checking on its own. Signed-off-by: Eric Sunshine --- No changes since v2. builtin/worktree.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/builtin/worktree.c b/builtin/worktree.c index da76eb7..cf35b2a 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -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" @@ -188,11 +190,26 @@ static int add_worktree(const char *path, const char *refname, struct child_process cp; struct argv_array child_env = ARGV_ARRAY_INIT; int counter = 0, len, ret; + struct strbuf symref = STRBUF_INIT; + struct commit *commit = NULL; unsigned char rev[20]; 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)); @@ -281,6 +298,7 @@ static int add_worktree(const char *path, const char *refname, 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; -- 2.5.0.rc2.378.g0af52e8