From patchwork Tue Oct 23 21:04:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommi Vainikainen X-Patchwork-Id: 10653679 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BAA5414BB for ; Tue, 23 Oct 2018 21:04:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A508D2A2D5 for ; Tue, 23 Oct 2018 21:04:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 995F92A41C; Tue, 23 Oct 2018 21:04:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 316F32A2D5 for ; Tue, 23 Oct 2018 21:04:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727106AbeJXF3Z (ORCPT ); Wed, 24 Oct 2018 01:29:25 -0400 Received: from mail-ed1-f50.google.com ([209.85.208.50]:34206 "EHLO mail-ed1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725948AbeJXF3Z (ORCPT ); Wed, 24 Oct 2018 01:29:25 -0400 Received: by mail-ed1-f50.google.com with SMTP id w19-v6so3010274eds.1 for ; Tue, 23 Oct 2018 14:04:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=hMgaOIo5rXeN89f8lUF6BdDvamEAPd1/D18oDuL+1pc=; b=Gd1sYYi/udoZ5BQCdjiMETuT9LiEJKK0kp5VDkH3krhxf5YFBkmwi36ccOR7l782qG gOLEbfK2clr73sX25DLqdzPNNVvY8JGAKgfhQ9NqRk+b2/9z7IoXrA8TsWz+IYl/07cf +chXxOUrIpgXGfrqBJ/J7RToJfFejJs1lXsyk/YUsFW1WA7S+f+z/bAIT0G+TeTfwr9l NvLdNOLPZSgNDZ01xoAZ5edexjKt+zVySTyCqfWv5zh1ux8HA184DAv6Theu9o7xpeEB AhqnQPyKli52acxzndDFd8d0A940mRDbhpM6Aizv0a5G79wf5uizrky3GvepLKbMxjE5 ESpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=hMgaOIo5rXeN89f8lUF6BdDvamEAPd1/D18oDuL+1pc=; b=bbeSlJ1Y1MKP9U5Z61eHltGSIbKKXRoYukWBL91+QFIZKvwr1Aljor+aNwx16qyElx X4XLrFgOq0LGQDXXIk8K8gfZGCsFQ1V1YCyPzvNkdJJMc3NlQQToBaJvcH6DExsDELPW RhMOWVWMCWhzOngKLOzVxbdiRxQsebSHh3U4JQTmmxpJuS6a/swzVwErqexOaKYMEHjM Ldg65Ev8rqQ/c301Esq9EsfAXCAxdo3dc38QoEDtvz2v735a0mTKwBzHdAmWOLZj1cNz GuoJphREbLc7+QmG0cK+WJa2iSTjT9zjc4/t6d5bq+qT8H1vuGS0GC19F6nyyksv/jQK bGKw== X-Gm-Message-State: ABuFfojDyYJyjFaSU2zm48o+BFbCkWNT4ruYLcoVJyTfzVbtGkgRCFnW X2gXNftg+1GuQtAdQ8CCtqGjtsf6HtCtkwms8vUnI4/2 X-Google-Smtp-Source: ACcGV62It+WrE1FMprRhtcLyNBElg+B6kyI66ehSjQ+Y2yyfAXpYVypVdFlm/Wm+3s4Rc24nhu5E1O0FKBOG4DAN9gM= X-Received: by 2002:a17:906:6054:: with SMTP id p20-v6mr38900841ejj.40.1540328657974; Tue, 23 Oct 2018 14:04:17 -0700 (PDT) MIME-Version: 1.0 From: Tommi Vainikainen Date: Wed, 24 Oct 2018 00:04:06 +0300 Message-ID: Subject: git pull defaults for recursesubmodules To: git@vger.kernel.org Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I configured my local git to fetch with recurseSubmodules = on-demand, which I found the most convenient setting. However then I noticed that I mostly use git pull actually to fetch from remotes, but git pull does not utilize any recurseSubmoddules setting now, or at least I could not find such. I would expect that if git-config has fetch.recurseSubmodules set, also git pull should use this setting, or at least similar option such as pull.recurseSubmodules should be available. I'd prefer sharing fetch.recurseSubmodules setting here. I've attached a minimal patch, which I believe implements this configuration usage, and a test case to show my expected behavior for git pull. --- Tommi Vainikainen From e4483ec5b3d9c38a6e30aa0ab9fa521cba582345 Mon Sep 17 00:00:00 2001 From: Tommi Vainikainen Date: Tue, 23 Oct 2018 23:47:58 +0300 Subject: [PATCH 1/1] pull: obey fetch.recurseSubmodules when fetching "git pull" now uses same recurse-submodules config for fetching as "git fetch" by default if not overridden from command line.1 --- builtin/pull.c | 3 +++ t/t5572-pull-submodule.sh | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/builtin/pull.c b/builtin/pull.c index 798ecf7faf..ed39b0e8ed 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -347,6 +347,9 @@ static int git_pull_config(const char *var, const char *value, void *cb) recurse_submodules = git_config_bool(var, value) ? RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF; return 0; + } else if (!strcmp(var, "fetch.recursesubmodules")) { + recurse_submodules = parse_fetch_recurse_submodules_arg(var, value); + return 0; } return git_default_config(var, value, cb); } diff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh index f916729a12..579ae5c374 100755 --- a/t/t5572-pull-submodule.sh +++ b/t/t5572-pull-submodule.sh @@ -75,6 +75,17 @@ test_expect_success "submodule.recurse option triggers recursive pull" ' test_path_is_file super/sub/merge_strategy_2.t ' +test_expect_success "fetch.recurseSubmodules=true triggers recursive pull" ' + test_commit -C child fetch_recurse_submodules && + git -C parent submodule update --remote && + git -C parent add sub && + git -C parent commit -m "update submodule" && + + git -C super config fetch.recurseSubmodules true && + git -C super pull --no-rebase && + test_path_is_file super/sub/fetch_recurse_submodules.t +' + test_expect_success " --[no-]recurse-submodule and submodule.recurse" ' test_commit -C child merge_strategy_3 && git -C parent submodule update --remote && -- 2.19.1