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, DATE_IN_PAST_03_06,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, 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 36B0D1FD99 for ; Sun, 14 Aug 2016 12:04:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934208AbcHNMEd (ORCPT ); Sun, 14 Aug 2016 08:04:33 -0400 Received: from avasout07.plus.net ([84.93.230.235]:53860 "EHLO avasout07.plus.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933127AbcHNMEb (ORCPT ); Sun, 14 Aug 2016 08:04:31 -0400 Received: from [10.0.2.15] ([209.93.82.95]) by avasout07 with smtp id WjXR1t00223PrXV01jXSZx; Sat, 13 Aug 2016 20:31:28 +0100 X-CM-Score: 0.00 X-CNFS-Analysis: v=2.2 cv=UYYTc+aN c=1 sm=1 tr=0 a=MrGUH+yfTxdMEvUZuMmDjA==:117 a=MrGUH+yfTxdMEvUZuMmDjA==:17 a=IkcTkHD0fZMA:10 a=EBOSESyhAAAA:8 a=OF09KEZyudElgfBYXCwA:9 a=yJM6EZoI5SlJf8ks9Ge_:22 X-AUTH: ramsayjones@:2500 To: Stefan Beller Cc: Junio C Hamano , GIT Mailing-list From: Ramsay Jones Subject: [PATCH] submodule: mark a file-local symbol as static Message-ID: Date: Sat, 13 Aug 2016 15:31:24 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Ramsay Jones --- Hi Stefan, If you need to re-roll your 'sb/submodule-clone-rr' branch, could you please squash this into the relevant patch (commit 7bcd1d17, "clone: recursive and reference option triggers submodule alternates", 11-08-2016). Thanks! [What, deja vu? :-D] ATB, Ramsay Jones builtin/submodule--helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index c617667..cb0b1d7 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -483,7 +483,7 @@ struct submodule_alternate_setup { #define SUBMODULE_ALTERNATE_SETUP_INIT { NULL, \ SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL } -int add_possible_reference_from_superproject( +static int add_possible_reference_from_superproject( struct alternate_object_database *alt, void *sas_cb) { struct submodule_alternate_setup *sas = sas_cb; -- 2.9.0