From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v2 16/32] setup.c: detect $GIT_COMMON_DIR in is_git_directory() Date: Thu, 11 Sep 2014 05:41:52 +0700 Message-ID: <1410388928-32265-17-git-send-email-pclouds@gmail.com> References: <1409387642-24492-1-git-send-email-pclouds@gmail.com> <1410388928-32265-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Sep 11 00:43:36 2014 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 1XRqbt-0001qF-9Y for gcvg-git-2@plane.gmane.org; Thu, 11 Sep 2014 00:43:33 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753301AbaIJWn3 convert rfc822-to-quoted-printable (ORCPT ); Wed, 10 Sep 2014 18:43:29 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:48942 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753063AbaIJWn2 (ORCPT ); Wed, 10 Sep 2014 18:43:28 -0400 Received: by mail-pd0-f174.google.com with SMTP id v10so11985924pde.33 for ; Wed, 10 Sep 2014 15:43:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=k6omhDpjag9slUieXP8g1PSfr96CgVh0EuJht5BNJCs=; b=NE2XaEz1iBBXj4MkgpCVHjAl2H/mQnKX6eQA/XNXJVAkYWrI0RfTup3TUwEe3nFvL0 0tdjH8u3PqnBC7ylO//HJbsQDE11NQ0xUgK1VR850u6Vyyhx5HiNFrhisB05FJLGcObT H8t/IFnDzNY8hID2PhO3yqWGEtE/v/NvuxYQf2Lr1RoTIcB7CgLdUN8kH3eNeNWB3UrS mZEu6FlrDi6lz339PRL2Cyvum6WKWEF8Z6OO6K1UrfC8e5QuOtBawNYU1ubWDkndfjAp amQFK5INw4Ub+s0sTLiAWTBY8kSaA959AXuzhoTfaOmCi2YRM6khpPuxBPYRr5+lCKlA qYdw== X-Received: by 10.70.89.43 with SMTP id bl11mr177171pdb.163.1410389008325; Wed, 10 Sep 2014 15:43:28 -0700 (PDT) Received: from lanh ([115.73.197.210]) by mx.google.com with ESMTPSA id y9sm16347946pas.23.2014.09.10.15.43.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Sep 2014 15:43:27 -0700 (PDT) Received: by lanh (sSMTP sendmail emulation); Thu, 11 Sep 2014 05:43:48 +0700 X-Mailer: git-send-email 2.1.0.rc0.78.gc0d8480 In-Reply-To: <1410388928-32265-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: If the file "$GIT_DIR/commondir" exists, it contains the value of $GIT_COMMON_DIR. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy Signed-off-by: Junio C Hamano --- Documentation/gitrepository-layout.txt | 7 ++++++ setup.c | 43 ++++++++++++++++++++++++++= +++----- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/Documentation/gitrepository-layout.txt b/Documentation/git= repository-layout.txt index b7b9dfb..1cc33f3 100644 --- a/Documentation/gitrepository-layout.txt +++ b/Documentation/gitrepository-layout.txt @@ -236,6 +236,13 @@ shallow:: file is ignored if $GIT_COMMON_DIR is set and "$GIT_COMMON_DIR/shallow" will be used instead. =20 +commondir:: + If this file exists, $GIT_COMMON_DIR (see linkgit:git[1]) will + be set to the path specified in this file if it is not + explicitly set. If the specified path is relative, it is + relative to $GIT_DIR. The repository with commondir is + incomplete without the repository pointed by "commondir". + modules:: Contains the git-repositories of the submodules. This directory is ignored if $GIT_COMMON_DIR is set and diff --git a/setup.c b/setup.c index 425fd79..176d505 100644 --- a/setup.c +++ b/setup.c @@ -224,6 +224,33 @@ void verify_non_filename(const char *prefix, const= char *arg) "'git [...] -- [...]'", arg); } =20 +static void get_common_dir(struct strbuf *sb, const char *gitdir) +{ + struct strbuf data =3D STRBUF_INIT; + struct strbuf path =3D STRBUF_INIT; + const char *git_common_dir =3D getenv(GIT_COMMON_DIR_ENVIRONMENT); + if (git_common_dir) { + strbuf_addstr(sb, git_common_dir); + return; + } + strbuf_addf(&path, "%s/commondir", gitdir); + if (file_exists(path.buf)) { + if (strbuf_read_file(&data, path.buf, 0) <=3D 0) + die_errno(_("failed to read %s"), path.buf); + while (data.len && (data.buf[data.len - 1] =3D=3D '\n' || + data.buf[data.len - 1] =3D=3D '\r')) + data.len--; + data.buf[data.len] =3D '\0'; + strbuf_reset(&path); + if (!is_absolute_path(data.buf)) + strbuf_addf(&path, "%s/", gitdir); + strbuf_addbuf(&path, &data); + strbuf_addstr(sb, real_path(path.buf)); + } else + strbuf_addstr(sb, gitdir); + strbuf_release(&data); + strbuf_release(&path); +} =20 /* * Test if it looks like we're at a git directory. @@ -242,13 +269,22 @@ int is_git_directory(const char *suspect) int ret =3D 0; size_t len; =20 - strbuf_addstr(&path, suspect); + /* Check worktree-related signatures */ + strbuf_addf(&path, "%s/HEAD", suspect); + if (validate_headref(path.buf)) + goto done; + + strbuf_reset(&path); + get_common_dir(&path, suspect); len =3D path.len; + + /* Check non-worktree-related signatures */ if (getenv(DB_ENVIRONMENT)) { if (access(getenv(DB_ENVIRONMENT), X_OK)) goto done; } else { + strbuf_setlen(&path, len); strbuf_addstr(&path, "/objects"); if (access(path.buf, X_OK)) goto done; @@ -259,11 +295,6 @@ int is_git_directory(const char *suspect) if (access(path.buf, X_OK)) goto done; =20 - strbuf_setlen(&path, len); - strbuf_addstr(&path, "/HEAD"); - if (validate_headref(path.buf)) - goto done; - ret =3D 1; done: strbuf_release(&path); --=20 2.1.0.rc0.78.gc0d8480