From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-6.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 466F91FF40 for ; Thu, 1 Dec 2016 01:28:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932197AbcLAB2u (ORCPT ); Wed, 30 Nov 2016 20:28:50 -0500 Received: from mail-pg0-f46.google.com ([74.125.83.46]:35780 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754710AbcLAB2s (ORCPT ); Wed, 30 Nov 2016 20:28:48 -0500 Received: by mail-pg0-f46.google.com with SMTP id p66so88297734pga.2 for ; Wed, 30 Nov 2016 17:28:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gzcCgLlPohIeP0g8ch9C+4dNvGFw0lzbspSVeRVJMFg=; b=QogcY6abwlS3yPsuCyj1ltf7JkYIeYDq3jm136UxL+vXFKNVLZdO60F4sbgCLIl9Y3 AqmX0KIdTqIfzmg+DKcEh+vuXR2/t6GVi8aaO8j2YBx2dFzgnqpBGtvU/tkzWrifRALr jBiaDfEvc8jFvgFSU9P8ESuBLTIvJImgkQyPXFtliVR2COLmV41jSR+lQrmR/khmQJne W5PjZWDJH1hDM5f3pnHxS+Fhuc2N37AoehNApr8h8wGPjZck0T0tX+ml1hajwIeKHelL AhSF/AwTOnutN1q2H05kl7RaXyVeplj1WzGyqyjlDx4xquXusYQlYnWGhQp1uJOQlwd3 g2vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gzcCgLlPohIeP0g8ch9C+4dNvGFw0lzbspSVeRVJMFg=; b=H9AND8YDqXxwnTK7RmY5rgDjOtch2zYas9vQF67Hk7xNkDtupDgH1vh69HSjKIT5MA 1MEvS4/KmJADV8nqV//mDGvKS1z1ojhi+OzLS03to1nklp76qYE+Iy/dM1MAM7Nb/xp3 OGEbtsZGa8vchYkXTMhmyuOiiMbGlVJWUo62HM2lrwIXBEG8j9WHYm0iJAK53n0x+0+U 3F+GxjPmKtxpixi4/CV1vXBIMRRghB0mCCRYvWfqG9SzF6yAqpHSYtiL87a1EUZWZ/7+ JbtXWVP3IYQYzcCvqPZDWzCkZ3KzgGwcIEaYRBZJ/QjsEG3yoZKd9b6Cpi+h7KrBC5CK tc+g== X-Gm-Message-State: AKaTC01/CnbDR6TJt4sm1Zyn4Zud21iWDGmE5omeXQPutz2UoK8ne1TKc6XEmQHJSoMQau7u X-Received: by 10.84.210.13 with SMTP id z13mr12160150plh.167.1480555727875; Wed, 30 Nov 2016 17:28:47 -0800 (PST) Received: from roshar.mtv.corp.google.com ([172.27.69.28]) by smtp.gmail.com with ESMTPSA id i194sm87872386pgc.46.2016.11.30.17.28.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Nov 2016 17:28:47 -0800 (PST) From: Brandon Williams To: git@vger.kernel.org Cc: Brandon Williams , peff@peff.net, sbeller@google.com, jonathantanmy@google.com, gitster@pobox.com Subject: [PATCH v6 2/6] submodules: load gitmodules file from commit sha1 Date: Wed, 30 Nov 2016 17:28:30 -0800 Message-Id: <1480555714-186183-3-git-send-email-bmwill@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1480555714-186183-1-git-send-email-bmwill@google.com> References: <1479840397-68264-1-git-send-email-bmwill@google.com> <1480555714-186183-1-git-send-email-bmwill@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org teach submodules to load a '.gitmodules' file from a commit sha1. This enables the population of the submodule_cache to be based on the state of the '.gitmodules' file from a particular commit. Signed-off-by: Brandon Williams --- cache.h | 2 ++ config.c | 8 ++++---- submodule-config.c | 6 +++--- submodule-config.h | 3 +++ submodule.c | 12 ++++++++++++ submodule.h | 1 + 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/cache.h b/cache.h index 1be6526..559a461 100644 --- a/cache.h +++ b/cache.h @@ -1690,6 +1690,8 @@ extern int git_default_config(const char *, const char *, void *); extern int git_config_from_file(config_fn_t fn, const char *, void *); extern int git_config_from_mem(config_fn_t fn, const enum config_origin_type, const char *name, const char *buf, size_t len, void *data); +extern int git_config_from_blob_sha1(config_fn_t fn, const char *name, + const unsigned char *sha1, void *data); extern void git_config_push_parameter(const char *text); extern int git_config_from_parameters(config_fn_t fn, void *data); extern void git_config(config_fn_t fn, void *); diff --git a/config.c b/config.c index 83fdecb..4d78e72 100644 --- a/config.c +++ b/config.c @@ -1214,10 +1214,10 @@ int git_config_from_mem(config_fn_t fn, const enum config_origin_type origin_typ return do_config_from(&top, fn, data); } -static int git_config_from_blob_sha1(config_fn_t fn, - const char *name, - const unsigned char *sha1, - void *data) +int git_config_from_blob_sha1(config_fn_t fn, + const char *name, + const unsigned char *sha1, + void *data) { enum object_type type; char *buf; diff --git a/submodule-config.c b/submodule-config.c index 098085b..8b9a2ef 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -379,9 +379,9 @@ static int parse_config(const char *var, const char *value, void *data) return ret; } -static int gitmodule_sha1_from_commit(const unsigned char *commit_sha1, - unsigned char *gitmodules_sha1, - struct strbuf *rev) +int gitmodule_sha1_from_commit(const unsigned char *commit_sha1, + unsigned char *gitmodules_sha1, + struct strbuf *rev) { int ret = 0; diff --git a/submodule-config.h b/submodule-config.h index d05c542..78584ba 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -29,6 +29,9 @@ const struct submodule *submodule_from_name(const unsigned char *commit_sha1, const char *name); const struct submodule *submodule_from_path(const unsigned char *commit_sha1, const char *path); +extern int gitmodule_sha1_from_commit(const unsigned char *commit_sha1, + unsigned char *gitmodules_sha1, + struct strbuf *rev); void submodule_free(void); #endif /* SUBMODULE_CONFIG_H */ diff --git a/submodule.c b/submodule.c index f336ca9..8516ab0 100644 --- a/submodule.c +++ b/submodule.c @@ -198,6 +198,18 @@ void gitmodules_config(void) } } +void gitmodules_config_sha1(const unsigned char *commit_sha1) +{ + struct strbuf rev = STRBUF_INIT; + unsigned char sha1[20]; + + if (gitmodule_sha1_from_commit(commit_sha1, sha1, &rev)) { + git_config_from_blob_sha1(submodule_config, rev.buf, + sha1, NULL); + } + strbuf_release(&rev); +} + /* * Determine if a submodule has been initialized at a given 'path' */ diff --git a/submodule.h b/submodule.h index 6ec5f2f..9203d89 100644 --- a/submodule.h +++ b/submodule.h @@ -37,6 +37,7 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt, const char *path); int submodule_config(const char *var, const char *value, void *cb); void gitmodules_config(void); +extern void gitmodules_config_sha1(const unsigned char *commit_sha1); extern int is_submodule_initialized(const char *path); extern int is_submodule_populated(const char *path); int parse_submodule_update_strategy(const char *value, -- 2.8.0.rc3.226.g39d4020