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=-3.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD shortcircuit=no autolearn=no 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 543591FAEB for ; Thu, 8 Jun 2017 23:41:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751673AbdFHXlo (ORCPT ); Thu, 8 Jun 2017 19:41:44 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:34416 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751661AbdFHXln (ORCPT ); Thu, 8 Jun 2017 19:41:43 -0400 Received: by mail-pg0-f43.google.com with SMTP id v18so20713846pgb.1 for ; Thu, 08 Jun 2017 16:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jFYTLnqPO9TsJTpvRzYHYT8Qd18fCRAm3Fv8sONuq3w=; b=qkhyDkaMaH2VklavbdN2JBxgRXu5wS+L+EaHBClZYS0r44GG5dAfm224PHtrzZxeM7 2ZrJ4Ny9D6bx/GrXmlRZJS7EEWh8O3ANE1DHZsgIYhvrNyqeGOM1syPzxUfoyXYwUL+c daqONiJh1kJSUNlhfpGaJMV+LMVSaajO23ffQQSNVQXasOWFq8SgROjMqaANTSVfnOhf iaIYm1RMiuzRYIaaMVP+DBRNv4VORVE5jJCD+g8vt7Q/oxzBrmhR8BJ8L4j5at1FEd2H tZ7x64+NZuI5ksDKCCKlB6k/zgnIKU3uVVmeMzGAYtJjNIQGZOilxXlAd98BUBtG9XmF 4UPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jFYTLnqPO9TsJTpvRzYHYT8Qd18fCRAm3Fv8sONuq3w=; b=OKWKh/34hBw0jknwoGHtaxtIZz85dGO7D/GwEqtk8z/btY1FOcj3DQRDU7/fB6Yd5R +8PCs+XoBacNIXIPwclO49q4lWAZEXE0PCRJNMQwNEVsNEVE8iLfTUylvjYIE5BnXvA6 CrJa7T48n2lhcwjerNrIgC1I7CA2YioN7mP9VBbCUlN4qmEiZNi9FI/1SbELhvewXkdR UB+H+gcxyzZy4wwFX9yd7YMHNtKQ6BMMEJpkO9iZF3MBUS/1BOf4n3f+9yDgH28QBsYv pHZjb+npHDS7vg/kpPf6iFkaEe35reOwn4ZIa+HF107JRW6yl3aCA2O96FmjbHEQxxU4 F48w== X-Gm-Message-State: AODbwcD/+D0tTMSxvmnFa1jRSUWguDhMLaAZIf6CIGtOMXV3OFtlCU2Z godBezxlAbn5385MDyb/Jw== X-Received: by 10.98.141.199 with SMTP id p68mr39768519pfk.55.1496965296792; Thu, 08 Jun 2017 16:41:36 -0700 (PDT) Received: from roshar.svl.corp.google.com ([100.96.218.30]) by smtp.gmail.com with ESMTPSA id m65sm11745237pfg.94.2017.06.08.16.41.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Jun 2017 16:41:35 -0700 (PDT) From: Brandon Williams To: git@vger.kernel.org Cc: sbeller@google.com, jrnieder@gmail.com, jacob.keller@gmail.com, Johannes.Schindelin@gmx.de, sandals@crustytoothpaste.net, peartben@gmail.com, pclouds@gmail.com, gitster@pobox.com, peff@peff.net, git@jeffhostetler.com, avarab@gmail.com, jonathantanmy@google.com, Brandon Williams Subject: [PATCH v2 14/32] submodule: add repo_read_gitmodules Date: Thu, 8 Jun 2017 16:40:42 -0700 Message-Id: <20170608234100.188529-15-bmwill@google.com> X-Mailer: git-send-email 2.13.1.508.gb3defc5cc-goog In-Reply-To: <20170608234100.188529-1-bmwill@google.com> References: <20170531214417.38857-1-bmwill@google.com> <20170608234100.188529-1-bmwill@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Teach the repo object to be able to populate the submodule_cache by reading the repository's gitmodules file. Signed-off-by: Brandon Williams --- submodule.c | 15 +++++++++++++++ submodule.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/submodule.c b/submodule.c index 95328de61..65f60ab57 100644 --- a/submodule.c +++ b/submodule.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "repository.h" #include "config.h" #include "submodule-config.h" #include "submodule.h" @@ -202,6 +203,20 @@ void gitmodules_config(void) } } +static int gitmodules_cb(const char *var, const char *value, void *data) +{ + struct repository *repo = data; + return submodule_config_option(repo, var, value); +} + +void repo_read_gitmodules(struct repository *repo) +{ + char *gitmodules_path = repo_worktree_path(repo, ".gitmodules"); + + git_config_from_file(gitmodules_cb, gitmodules_path, repo); + free(gitmodules_path); +} + void gitmodules_config_sha1(const unsigned char *commit_sha1) { struct strbuf rev = STRBUF_INIT; diff --git a/submodule.h b/submodule.h index 8fb0f2549..ec6ea8dfd 100644 --- a/submodule.h +++ b/submodule.h @@ -1,6 +1,7 @@ #ifndef SUBMODULE_H #define SUBMODULE_H +struct repository; struct diff_options; struct argv_array; struct oid_array; @@ -40,6 +41,7 @@ extern void set_diffopt_flags_from_submodule_config(struct diff_options *, const char *path); extern int submodule_config(const char *var, const char *value, void *cb); extern void gitmodules_config(void); +extern void repo_read_gitmodules(struct repository *repo); extern void gitmodules_config_sha1(const unsigned char *commit_sha1); extern int is_submodule_initialized(const char *path); /* -- 2.13.1.508.gb3defc5cc-goog