git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	bjornar@snoksrud.no, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v3 3/5] enter_repo: allow .git files in strict mode
Date: Sun, 13 Sep 2015 08:02:26 +0700	[thread overview]
Message-ID: <1442106148-22895-4-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1442106148-22895-1-git-send-email-pclouds@gmail.com>

Strict mode is about not guessing where .git is. If the user points to a
.git file, we know exactly where the target .git dir will be.

This is needed even in local clone case because transport.c code uses
upload-pack for fetching remote refs.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 path.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/path.c b/path.c
index 7340e11..32d4ca6 100644
--- a/path.c
+++ b/path.c
@@ -438,8 +438,13 @@ const char *enter_repo(const char *path, int strict)
 			return NULL;
 		path = validated_path;
 	}
-	else if (chdir(path))
-		return NULL;
+	else {
+		const char *gitfile = read_gitfile(used_path);
+		if (gitfile)
+			path = gitfile;
+		if (chdir(path))
+			return NULL;
+	}
 
 	if (is_git_directory(".")) {
 		set_git_dir(".");
-- 
2.3.0.rc1.137.g477eb31

  parent reply	other threads:[~2015-09-13  1:02 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-15  9:40 workdirs: cannot clone a local workdir directory Bjørnar Snoksrud
2015-07-15 13:25 ` Duy Nguyen
2015-08-22  0:39   ` [PATCH v2 0/5] fix local clone from a linked checkout Nguyễn Thái Ngọc Duy
2015-08-22  0:39     ` [PATCH v2 1/5] path.c: delete an extra space Nguyễn Thái Ngọc Duy
2015-08-22  0:39     ` [PATCH v2 2/5] enter_repo: avoid duplicating logic, use is_git_directory() instead Nguyễn Thái Ngọc Duy
2015-09-07 16:33       ` Junio C Hamano
2015-09-13  0:49         ` Duy Nguyen
2015-09-13  1:04           ` Junio C Hamano
2015-09-14 11:57             ` Duy Nguyen
2015-09-21 22:42               ` Junio C Hamano
2015-08-22  0:40     ` [PATCH v2 3/5] enter_repo: allow .git files in strict mode Nguyễn Thái Ngọc Duy
2015-08-22  0:40     ` [PATCH v2 4/5] clone: allow --local from a linked checkout Nguyễn Thái Ngọc Duy
2015-09-07 16:25       ` Junio C Hamano
2015-08-22  0:40     ` [PATCH v2 5/5] clone: better error when --reference is " Nguyễn Thái Ngọc Duy
2015-09-13  1:02     ` [PATCH v3 0/5] fix local clone from " Nguyễn Thái Ngọc Duy
2015-09-13  1:02       ` [PATCH v3 1/5] path.c: delete an extra space Nguyễn Thái Ngọc Duy
2015-09-13  1:02       ` [PATCH v3 2/5] enter_repo: avoid duplicating logic, use is_git_directory() instead Nguyễn Thái Ngọc Duy
2015-09-13  1:02       ` Nguyễn Thái Ngọc Duy [this message]
2015-09-25 19:59         ` [PATCH v3 3/5] enter_repo: allow .git files in strict mode Junio C Hamano
2015-09-13  1:02       ` [PATCH v3 4/5] clone: allow --local from a linked checkout Nguyễn Thái Ngọc Duy
2015-09-13  1:02       ` [PATCH v3 5/5] clone: better error when --reference is " Nguyễn Thái Ngọc Duy
2015-09-28 13:06       ` [PATCH v4 0/6] fix local clone from " Nguyễn Thái Ngọc Duy
2015-09-28 13:06         ` [PATCH v4 1/6] path.c: delete an extra space Nguyễn Thái Ngọc Duy
2015-09-28 13:06         ` [PATCH v4 2/6] t0002: add test for enter_repo(), non-strict mode Nguyễn Thái Ngọc Duy
2015-09-28 13:06         ` [PATCH v4 3/6] enter_repo: avoid duplicating logic, use is_git_directory() instead Nguyễn Thái Ngọc Duy
2015-09-28 13:06         ` [PATCH v4 4/6] enter_repo: allow .git files in strict mode Nguyễn Thái Ngọc Duy
2015-09-28 13:06         ` [PATCH v4 5/6] clone: allow --local from a linked checkout Nguyễn Thái Ngọc Duy
2015-09-28 13:06         ` [PATCH v4 6/6] clone: better error when --reference is " Nguyễn Thái Ngọc Duy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1442106148-22895-4-git-send-email-pclouds@gmail.com \
    --to=pclouds@gmail.com \
    --cc=bjornar@snoksrud.no \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).