From mboxrd@z Thu Jan 1 00:00:00 1970 From: Aaron Schrab Subject: [PATCH v3 2/2] clone: Allow repo using gitfile as a reference Date: Tue, 9 Apr 2013 18:22:00 -0400 Message-ID: <1365546120-22048-3-git-send-email-aaron@schrab.com> References: <7v8v4rtzw4.fsf@alter.siamese.dyndns.org> <1365546120-22048-1-git-send-email-aaron@schrab.com> Cc: junio@pobox.com, jrnieder@gmail.com To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Apr 10 00:23:33 2013 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 1UPgwv-00057u-Cx for gcvg-git-2@plane.gmane.org; Wed, 10 Apr 2013 00:23:33 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936188Ab3DIWX1 (ORCPT ); Tue, 9 Apr 2013 18:23:27 -0400 Received: from pug.qqx.org ([50.116.43.67]:39859 "EHLO pug.qqx.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752344Ab3DIWX1 (ORCPT ); Tue, 9 Apr 2013 18:23:27 -0400 Received: from zim.qqx.org (cpe-107-015-024-243.nc.res.rr.com [107.15.24.243]) by pug.qqx.org (Postfix) with ESMTPSA id 94F2C57E03 for ; Tue, 9 Apr 2013 18:23:26 -0400 (EDT) Received: from ats (uid 1000) (envelope-from aaron@schrab.com) id 4011c by zim.qqx.org (DragonFly Mail Agent); Tue, 09 Apr 2013 18:23:24 -0400 X-Mailer: git-send-email 1.8.2.677.g9202ef0 In-Reply-To: <1365546120-22048-1-git-send-email-aaron@schrab.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Try reading gitfile files when processing --reference options to clone. This will allow, among other things, using a submodule checked out with a recent version of git as a reference repository without requiring the user to have internal knowledge of submodule layout. Signed-off-by: Aaron Schrab diff --git a/builtin/clone.c b/builtin/clone.c index 0a1e0bf..58fee98 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -232,11 +232,21 @@ static void strip_trailing_slashes(char *dir) static int add_one_reference(struct string_list_item *item, void *cb_data) { char *ref_git; + const char *repo; struct strbuf alternate = STRBUF_INIT; - /* Beware: real_path() and mkpath() return static buffer */ + /* Beware: read_gitfile(), real_path() and mkpath() return static buffer */ ref_git = xstrdup(real_path(item->string)); - if (is_directory(mkpath("%s/.git/objects", ref_git))) { + + repo = read_gitfile(ref_git); + if (!repo) + repo = read_gitfile(mkpath("%s/.git", ref_git)); + if (repo) { + free(ref_git); + ref_git = xstrdup(repo); + } + + if (!repo && is_directory(mkpath("%s/.git/objects", ref_git))) { char *ref_git_git = mkpathdup("%s/.git", ref_git); free(ref_git); ref_git = ref_git_git; diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh index 2a7b78b..719d778 100755 --- a/t/t5700-clone-reference.sh +++ b/t/t5700-clone-reference.sh @@ -185,4 +185,17 @@ test_expect_success 'fetch with incomplete alternates' ' ! grep " want $tag_object" "$U.K" ' +test_expect_success 'clone using repo with gitfile as a reference' ' + git clone --separate-git-dir=L A M && + git clone --reference=M A N && + echo "$base_dir/L/objects" >expected && + test_cmp expected "$base_dir/N/.git/objects/info/alternates" +' + +test_expect_success 'clone using repo pointed at by gitfile as reference' ' + git clone --reference=M/.git A O && + echo "$base_dir/L/objects" >expected && + test_cmp expected "$base_dir/O/.git/objects/info/alternates" +' + test_done -- 1.8.2.677.g9202ef0