From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 600A91F466 for ; Fri, 31 Jan 2020 21:11:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726174AbgAaVLg (ORCPT ); Fri, 31 Jan 2020 16:11:36 -0500 Received: from mail-wm1-f44.google.com ([209.85.128.44]:33319 "EHLO mail-wm1-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726102AbgAaVLg (ORCPT ); Fri, 31 Jan 2020 16:11:36 -0500 Received: by mail-wm1-f44.google.com with SMTP id m10so9663654wmc.0 for ; Fri, 31 Jan 2020 13:11:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:from:date:subject:mime-version:content-transfer-encoding :fcc:to:cc; bh=tX6cW7N8xg4uVZFu0AozdvbHBaZLdknSgtExvQPzNHM=; b=HISixUsNYsuCvbCJqDHIrSLjtnBxSTMBO0fEIQVpY/MHfCWneTqwwaF3hrOpjLCLs7 nCy/I+xA4/D8SBlqjXMoz/+Bs+UuSTvHq5VLjendhkfuY+2cVv9JaDhGsGM9pt5adhVb +u4usz4cTcwgHr3krHFA2R2f3lBLiKEoVmgBJ2OgSg3GOrcG10ZlGw5gX6i5VbK+O1T1 1lx5x19bw3X0vwWIXuBTQJ3QOwd8lVfgByJ6hYywxo9OYphYRyUIbsl7/1xVWHl/M4Ae TPCrnpG3IEPuXrpFNbfBWFMFyUGjggxDMN6uh4GYmLwHElchxAX0T9LtPieVvpt0QgTi 5gIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=tX6cW7N8xg4uVZFu0AozdvbHBaZLdknSgtExvQPzNHM=; b=BaNB5I9YHakYgIkQaZsXZoLVyVzB0HcHQg8ZOI9IhwEV94o5fx/Ao2v8lCkd8Vv8qC iBOErqauuRnJZrRxn/Zp4T+2ATJwd0nLD2JE2qj2qHXTN42zz634SAjNEaq5PL9//KVK YKnmB4L7UAFW72I/o49zsVFibtXGkAHrLXFLDZDSZAW/kIx63CmdctDHdVpTWKgGl2Zp MOjLaeuiLC+QGau/cnUYS/GdKjTO4FIMaqc2sDlT0NtK+L2sSiB43pCjyK4+jpTm5eDh mgzZNnk9JQeqGgRCycVsew1ywq2wREphtB9xy6LHGYyGYZqWIi4vmNihFO2mNXZxpwAU 6iDw== X-Gm-Message-State: APjAAAXptbsIaFTrEyvxsy6zuwHdUG/ERn+KIrNL6+kLP9w3ijX9DNA5 3WrhKBPQ9Y7j7DDN01hglMv7hPBT X-Google-Smtp-Source: APXvYqxYGzFpcuK4b4ey0bCvnC+kRjTOQTjgedTlnnFE0TcJfodEWT/NRo1I7vna11nqsamG1DoQ8w== X-Received: by 2002:a7b:c450:: with SMTP id l16mr14594889wmi.31.1580505093140; Fri, 31 Jan 2020 13:11:33 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id d8sm13035045wrx.71.2020.01.31.13.11.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jan 2020 13:11:32 -0800 (PST) Message-Id: From: "Markus Klein via GitGitGadget" Date: Fri, 31 Jan 2020 21:11:31 +0000 Subject: [PATCH] clone: use submodules.recurse option for automatically clone submodules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fcc: Sent To: git@vger.kernel.org Cc: Markus Klein , Markus Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Markus Simplify cloning repositories with submodules when the option submodules.recurse is set by the user. This makes it transparent to the user if submodules are used. The user doesn’t have to know if he has to add an extra parameter to get the full project including the used submodules. This makes clone behave identical to other commands like fetch, pull, checkout, ... which include the submodules automatically if this option is set. It is implemented analog to the pull command by using an own config function instead of using just the default config. In contrast to the pull command, the submodule.recurse state is saved as an array of strings as it can take an optionally pathspec argument which describes which submodules should be recursively initialized and cloned. To recursively initialize and clone all submodules a pathspec of "." has to be used. The regression test is simplified compared to the test for "git clone --recursive" as the general functionality is already checked there. Signed-off-by: Markus Klein --- Add the usage of the submodules.recurse parameter on clone I try to finish the pullrequest #573 from Maddimax. This adds the usage of the submodules.recurse parameter on clone Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-695%2FMasmiseim36%2Fdev%2FCloneWithSubmodule-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-695/Masmiseim36/dev/CloneWithSubmodule-v1 Pull-Request: https://github.com/git/git/pull/695 builtin/clone.c | 16 +++++++++++++++- t/t7407-submodule-foreach.sh | 11 +++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/builtin/clone.c b/builtin/clone.c index 0fc89ae2b9..21b9d927a2 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -26,6 +26,8 @@ #include "dir-iterator.h" #include "iterator.h" #include "sigchain.h" +#include "submodule-config.h" +#include "submodule.h" #include "branch.h" #include "remote.h" #include "run-command.h" @@ -929,6 +931,18 @@ static int path_exists(const char *path) return !stat(path, &sb); } +/** + * Read config variables. + */ +static int git_clone_config(const char *var, const char *value, void *cb) +{ + if (!strcmp(var, "submodule.recurse") && git_config_bool(var, value)) { + string_list_append(&option_recurse_submodules, "true"); + return 0; + } + return git_default_config(var, value, cb); +} + int cmd_clone(int argc, const char **argv, const char *prefix) { int is_bundle = 0, is_local; @@ -1103,7 +1117,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) write_config(&option_config); - git_config(git_default_config, NULL); + git_config(git_clone_config, NULL); if (option_bare) { if (option_mirror) diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh index 6b2aa917e1..44b32f7b27 100755 --- a/t/t7407-submodule-foreach.sh +++ b/t/t7407-submodule-foreach.sh @@ -383,6 +383,17 @@ test_expect_success 'use "update --recursive nested1" to checkout all submodules git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git ) ' +test_expect_success 'use "git clone" with submodule.recurse=true to checkout all submodules' ' + git clone -c submodule.recurse=true super clone7 && + ( + git -C clone7 rev-parse --resolve-git-dir .git --resolve-git-dir nested1/nested2/nested3/submodule/.git >actual && + cat >expect <<-EOF && + .git + $(pwd)/clone7/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule + EOF + test_cmp expect actual + ) +' test_expect_success 'command passed to foreach retains notion of stdin' ' ( base-commit: d0654dc308b0ba76dd8ed7bbb33c8d8f7aacd783 -- gitgitgadget