From patchwork Wed Feb 6 10:59:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10799073 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 557101390 for ; Wed, 6 Feb 2019 10:59:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4497F2AFCE for ; Wed, 6 Feb 2019 10:59:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 38F572B09C; Wed, 6 Feb 2019 10:59:57 +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 DC2862AFCE for ; Wed, 6 Feb 2019 10:59:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727807AbfBFK74 (ORCPT ); Wed, 6 Feb 2019 05:59:56 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:45797 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726159AbfBFK7z (ORCPT ); Wed, 6 Feb 2019 05:59:55 -0500 Received: by mail-pf1-f193.google.com with SMTP id j3so764666pfi.12 for ; Wed, 06 Feb 2019 02:59:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=U7FgL/y2qmXuw5zzWD7t3Y6oBH9U6y8z7ZMPEBV9Tls=; b=FnXgXzLYyny65UBqjh7npefpBP700NbG6/X/IDPl9mw30YAGiQTos+qoE3I58daoRL bYLB7hpl8/nu3ojZDwgXH2zDqfP5T+liHkp3jeU6yZ7CB2Xpbor6LESSzoJ5jW+sHVQR zQZ2our7b8jeDfiEKHByrBQO/k3jbTSKq/0jo16stdovnwsvUEczrc1wp3vAXAskaJlS S8MwdzaOwlzlS9gOqziS62Y28Je06zfHYmyBSjECPKDDmnXnNKDqj/RaEpLHXMeK3Uka shvc2QEfCYlgJ7K73tpymdvsXHrQeQ6pi4JeoP95XYB8tGz5cVpKBofKhxWUd4nOO3sB 7/Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=U7FgL/y2qmXuw5zzWD7t3Y6oBH9U6y8z7ZMPEBV9Tls=; b=aGlIQzL/JHo9Wwcv7tSjhJpstwgecaRP4ShyV4W9/4Gg5uuKrqAmtVdoA0mOCspwt+ cZOhSBEy/s35r41CgVtbZV6H5/4iS+MGUwbuE2+I/bW5d0F7qhWmlTio/5EKd1uNs6dy N1BJnWyp3VTaCbWjm5pEQhcN6gWvvrCZHbdmcCNkwLDUtoGEkGamkzCDeX52tpkwRb33 URjrhZ00eyUFc666ydwGway1M8DglcXOCXTgEveDRl/nIhKRZvGXRYHmcww6RirjIHRj V9QiTMBQVSs92OE3L7vwOs2Rvkfscc3xqHMgfqpsTjszIDoSiSRM59ylpNeGrE4uN+Lt OxFQ== X-Gm-Message-State: AHQUAuatvS0mer20jP5hbgKNkWoZab8TgQiwIp5ZbQglr5hiMfgiX0VX Xk0xVzTyHrYaDDvwQeKwrT4MR1jr X-Google-Smtp-Source: AHgI3IarHB59p9AeCZonHfjn1m15ZpPXSQudKUzGNFCdBgUbdb6t2y7+fQU64BRqD3Ll8I708FnUdw== X-Received: by 2002:a63:920a:: with SMTP id o10mr8826391pgd.141.1549450794516; Wed, 06 Feb 2019 02:59:54 -0800 (PST) Received: from archbookpro.localdomain (c-73-222-73-77.hsd1.ca.comcast.net. [73.222.73.77]) by smtp.gmail.com with ESMTPSA id y9sm8345770pfi.74.2019.02.06.02.59.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Feb 2019 02:59:53 -0800 (PST) Date: Wed, 6 Feb 2019 02:59:52 -0800 From: Denton Liu To: git@vger.kernel.org Cc: gitster@pobox.com Subject: [PATCH 1/3] git-submodule.txt: document default behavior without --branch Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.2 (2019-01-07) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This behavior is mentioned in gitmodules.txt but not in git-submodule.txt so we copy the information over so that it is not missed. Signed-off-by: Denton Liu --- Documentation/git-submodule.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index ba3c4df550..9951c68744 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -261,7 +261,8 @@ OPTIONS The name of the branch is recorded as `submodule..branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the - same name as the current branch in the current repository. + same name as the current branch in the current repository. If the + option is not specified, it defaults to 'master'. -f:: --force:: From patchwork Wed Feb 6 10:59:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10799075 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 D85921390 for ; Wed, 6 Feb 2019 10:59:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C41782AFCE for ; Wed, 6 Feb 2019 10:59:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B5EA02B09C; Wed, 6 Feb 2019 10:59:59 +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 567602AFCE for ; Wed, 6 Feb 2019 10:59:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727910AbfBFK76 (ORCPT ); Wed, 6 Feb 2019 05:59:58 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:33579 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726159AbfBFK75 (ORCPT ); Wed, 6 Feb 2019 05:59:57 -0500 Received: by mail-pl1-f193.google.com with SMTP id z8so295964plo.0 for ; Wed, 06 Feb 2019 02:59:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=D+wYeqL196jGWECUl39JdL7IpNP2Jb/VtyP9jCU3FWs=; b=eHiR7FMVDmSiyRzi4o66epZbKCQT8F7WKiRJVwKRS64R95dc+8My28dm2FqPxF30tS SAxvRh8onbzOXXZSm3JT8/4IWHwvp5WodmiysVaUBvSUV4H4trrrj2ZS5vMF6rysgnMV m7scQyOI8/BZR/r328AESTMFriUUzRr0KzIu4ogEfb6ARoXAslmjFwOooy/uP54FiseL x3LsZb513ZE4Oj0FRJVjdRi30Ukhkkmtu6dTogaAJZ0mJC5XTKak6D1UyL4S6PzUad3p eOWn7sdCJbwWYj2SxqLaAAxLfpHltApef4TJ4lvNpKmD7G8nRExqszhDGx6KPz7LyAZI sSRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=D+wYeqL196jGWECUl39JdL7IpNP2Jb/VtyP9jCU3FWs=; b=tyMyVhnKBm9FLFZQG8sJdmitEJ1bRcnNueNo32czx7w/5MzyzP+/W9GMEvK1+6mxrN hXmJnMU+pt6ME2g6HOcFcp/bx/UixIDhL3oKgl7QOB5K6TqM33pVgkPFbhYUBB76cg1w T3BeJOZxxPYK1g+eYOocZUgsJJhRb9XzyUIDwmzmp32JFYxvDo7RZTuCko2h07Th0t9g RfCokSgockBstcHsz9yNbVy0xkQtCvO6prWT4ANNqWOqDrwTdwR8RUDb62oclDGPVh1q EFqB0ErxLuOMD0LC4RMWihT7tzCMs+5NqKa/QsqrsHI2nQ753m5KVvn4gMZEpk7llwyo EYWw== X-Gm-Message-State: AHQUAubCTM+OX2pW+AjhL27sxpG78eJesRR6o5TGUO5SEUTVawOYy1Qp W45THDpbvyX3QBRatJNY3JqJW6W/ X-Google-Smtp-Source: AHgI3IY7iNlXkbuGZEzxDDSBTjMDtYqerCanglBk7F+KJzf0qTfiTkGunkOISSMgzLaN1M40EhKLJQ== X-Received: by 2002:a17:902:9691:: with SMTP id n17mr10365932plp.9.1549450797028; Wed, 06 Feb 2019 02:59:57 -0800 (PST) Received: from archbookpro.localdomain (c-73-222-73-77.hsd1.ca.comcast.net. [73.222.73.77]) by smtp.gmail.com with ESMTPSA id m3sm9477017pfi.102.2019.02.06.02.59.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Feb 2019 02:59:56 -0800 (PST) Date: Wed, 6 Feb 2019 02:59:54 -0800 From: Denton Liu To: git@vger.kernel.org Cc: gitster@pobox.com Subject: [PATCH 2/3] submodule--helper: teach config subcommand --unset Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.2 (2019-01-07) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This teaches submodule--helper config the --unset option, which removes the specified configuration key from the .gitmodule file. Signed-off-by: Denton Liu --- builtin/submodule--helper.c | 15 +++++++++++---- t/t7411-submodule-config.sh | 9 +++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 0e140f176c..336e4429e6 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2149,15 +2149,21 @@ static int module_config(int argc, const char **argv, const char *prefix) enum { CHECK_WRITEABLE = 1 } command = 0; + enum { + DO_UNSET = 1 + } unset = 0; struct option module_config_options[] = { OPT_CMDMODE(0, "check-writeable", &command, N_("check if it is safe to write to the .gitmodules file"), CHECK_WRITEABLE), + OPT_CMDMODE(0, "unset", &unset, + N_("unset the config in the .gitmodules file"), + DO_UNSET), OPT_END() }; const char *const git_submodule_helper_usage[] = { - N_("git submodule--helper config name [value]"), + N_("git submodule--helper config name [--unset] [value]"), N_("git submodule--helper config --check-writeable"), NULL }; @@ -2169,15 +2175,16 @@ static int module_config(int argc, const char **argv, const char *prefix) return is_writing_gitmodules_ok() ? 0 : -1; /* Equivalent to ACTION_GET in builtin/config.c */ - if (argc == 2) + if (argc == 2 && unset != DO_UNSET) return print_config_from_gitmodules(the_repository, argv[1]); /* Equivalent to ACTION_SET in builtin/config.c */ - if (argc == 3) { + if (argc == 3 || (argc == 2 && unset == DO_UNSET)) { if (!is_writing_gitmodules_ok()) die(_("please make sure that the .gitmodules file is in the working tree")); - return config_set_in_gitmodules_file_gently(argv[1], argv[2]); + const char *value = (argc == 3) ? argv[2] : NULL; + return config_set_in_gitmodules_file_gently(argv[1], value); } usage_with_options(git_submodule_helper_usage, module_config_options); diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh index 89690b7adb..fcc0fb82d8 100755 --- a/t/t7411-submodule-config.sh +++ b/t/t7411-submodule-config.sh @@ -142,6 +142,15 @@ test_expect_success 'reading submodules config from the working tree with "submo ) ' +test_expect_success 'unsetting submodules config from the working tree with "submodule--helper config --unset"' ' + (cd super && + git submodule--helper config --unset submodule.submodule.url && + git submodule--helper config submodule.submodule.url >actual && + test_must_be_empty actual + ) +' + + test_expect_success 'writing submodules config with "submodule--helper config"' ' (cd super && echo "new_url" >expect && From patchwork Wed Feb 6 10:59:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10799077 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 E06F81390 for ; Wed, 6 Feb 2019 11:00:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C95D22AFCE for ; Wed, 6 Feb 2019 11:00:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B93292B23B; Wed, 6 Feb 2019 11:00:02 +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 1101E2AFCE for ; Wed, 6 Feb 2019 11:00:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728260AbfBFLAB (ORCPT ); Wed, 6 Feb 2019 06:00:01 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:37290 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726159AbfBFLAA (ORCPT ); Wed, 6 Feb 2019 06:00:00 -0500 Received: by mail-pf1-f195.google.com with SMTP id y126so2910226pfb.4 for ; Wed, 06 Feb 2019 03:00:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=2vZigOQSAutpt8Vt9YztXEdTmgbs1OwefroYN1/aRT4=; b=YtQaIDb1cDVgi8emOY7fReePB8gSUUOJevMuGHvUMIQt36KS1+vtRhvJ4asPC7aiUS u3rsWPROP+RmhKk2zDlfzo40JiG7RF8ufZnoq6pborSYeH+jTh2pQOb2hLZviCWD8UFO XXkjv8tKvAsdlGkZkTlB6OSv111jl/RrhdTrvkw57NKl7UPwuCKdEeXBmvBGsM965fnS hStZ/w44vxUbNn8tWowyUz/p/is96F7yqt+4d935FwOjCyNGkR5SVYz/bjqspWKSBkgQ YWAIVfIg1mrvUGYjQXm3NAd+oGgPdkuisbRcZVBZaNQLjqRwjLOKq62VWmGYZo7Utool fUYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=2vZigOQSAutpt8Vt9YztXEdTmgbs1OwefroYN1/aRT4=; b=FwWoC8lLC/hNGO3I9O33rOb2Nuw8wcbJYEJgzy1hAY3xksVsLaiYjZeq9zwx7TqDUm QeD817ju/kyBtT499gSzuhEbINxkv/rctx1v1O3KLmR1M51oGA4lwHsxkSk0EW9eQLkB kN4nS5RYGcJJUcATk+ir8zk/F8wPq7MOzNQd//guKA2Hv/Kjs4MK35dLYbL+iggJLhKY ZiYANs1ONSbWUXpFBz3RFajfUhM5mwIWCiWTvzM2OyWyRCSiU6Rz+IEM3ENCUrbHl5Ca AFZZ85KHOe9BR4SxrF25qSGrQO79EszyhlFomkRcFapRe0xYmFkNSEEGTkn0G+qpoZFt hbbA== X-Gm-Message-State: AHQUAubnE+aztEBEDo0WWAxfKsY153tT5i9AVjt8J/nsl0Eex/QyNTr7 COlg2crlm9zLOtkdzDHYCyvr1I3u X-Google-Smtp-Source: AHgI3IYzZMZhgpRVCVdpjNvFVOf69w5nvV3L8AskqzTPL4cHwDNjmZBsjVdK22ns4fiz7Htz4aZhMA== X-Received: by 2002:a63:6a05:: with SMTP id f5mr8907746pgc.72.1549450799586; Wed, 06 Feb 2019 02:59:59 -0800 (PST) Received: from archbookpro.localdomain (c-73-222-73-77.hsd1.ca.comcast.net. [73.222.73.77]) by smtp.gmail.com with ESMTPSA id b7sm7698450pfa.52.2019.02.06.02.59.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Feb 2019 02:59:58 -0800 (PST) Date: Wed, 6 Feb 2019 02:59:57 -0800 From: Denton Liu To: git@vger.kernel.org Cc: gitster@pobox.com Subject: [PATCH 3/3] submodule: teach set-branch subcommand Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.2 (2019-01-07) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This teaches git-submodule the set-branch subcommand which allows the branch of a submodule to be set through a porcelain command without having to manually manipulate the .gitmodules file. --- Documentation/git-submodule.txt | 7 ++ contrib/completion/git-completion.bash | 5 +- git-submodule.sh | 75 +++++++++++++++++++-- t/t7419-submodule-set-branch.sh | 93 ++++++++++++++++++++++++++ 4 files changed, 175 insertions(+), 5 deletions(-) create mode 100755 t/t7419-submodule-set-branch.sh diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 9951c68744..cb838ee556 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -14,6 +14,7 @@ SYNOPSIS 'git submodule' [--quiet] init [--] [...] 'git submodule' [--quiet] deinit [-f|--force] (--all|[--] ...) 'git submodule' [--quiet] update [] [--] [...] +'git submodule' [--quiet] set-branch [] [--] 'git submodule' [--quiet] summary [] [--] [...] 'git submodule' [--quiet] foreach [--recursive] 'git submodule' [--quiet] sync [--recursive] [--] [...] @@ -168,6 +169,12 @@ submodule with the `--init` option. If `--recursive` is specified, this command will recurse into the registered submodules, and update any nested submodules within. -- +set-branch ((-d|--default)|(-b|--branch )) [--] :: + Sets the default remote tracking branch for the submodule. The + `--branch` option allows the remote branch to be specified. The + `--default` option removes the submodule..branch configuration + key, which causes the tracking branch to default to 'master'. +-- summary [--cached|--files] [(-n|--summary-limit) ] [commit] [--] [...]:: Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 499e56f83d..8b3b5a9d34 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2573,7 +2573,7 @@ _git_submodule () { __git_has_doubledash && return - local subcommands="add status init deinit update summary foreach sync" + local subcommands="add status init deinit update set-branch summary foreach sync" local subcommand="$(__git_find_on_cmdline "$subcommands")" if [ -z "$subcommand" ]; then case "$cur" in @@ -2604,6 +2604,9 @@ _git_submodule () --force --rebase --merge --reference --depth --recursive --jobs " ;; + set-branch,--*) + __gitcomp "--default --branch" + ;; summary,--*) __gitcomp "--cached --files --summary-limit" ;; diff --git a/git-submodule.sh b/git-submodule.sh index 5e608f8bad..43ec756602 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -10,6 +10,7 @@ USAGE="[--quiet] add [-b ] [-f|--force] [--name ] [--reference ...] or: $dashless [--quiet] deinit [-f|--force] (--all| [--] ...) or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference ] [--recursive] [--] [...] + or: $dashless [--quiet] set-branch (--default|--branch ) [--] or: $dashless [--quiet] summary [--cached|--files] [--summary-limit ] [commit] [--] [...] or: $dashless [--quiet] foreach [--recursive] or: $dashless [--quiet] sync [--recursive] [--] [...] @@ -684,6 +685,72 @@ cmd_update() } } +# +# Configures a submodule's default branch +# +# $@ = requested path +# +cmd_set_branch() { + unset_branch=false + branch= + + while test $# -ne 0 + do + case "$1" in + -q|--quiet) + # we don't do anything with this but we need to accept it + ;; + -d|--default) + unset_branch=true + ;; + -b|--branch) + case "$2" in '') usage ;; esac + branch=$2 + shift + ;; + --) + shift + break + ;; + -*) + usage + ;; + *) + break + ;; + esac + shift + done + + if test $# -ne 1 + then + usage + fi + + # we can't use `git submodule--helper name` here because internally, it + # hashes the path so a trailing slash could lead to an unintentional no match + name="$(git submodule--helper list "$1" | cut -f2)" + if test -z "$name" + then + exit 1 + fi + + test -n "$branch"; has_branch=$? + test "$unset_branch" = true; has_unset_branch=$? + + if test $((!$has_branch != !$has_unset_branch)) -eq 0 + then + usage + fi + + if test $has_branch -eq 0 + then + git submodule--helper config submodule."$name".branch "$branch" + else + git submodule--helper config --unset submodule."$name".branch + fi +} + # # Show commit summary for submodules in index or working tree # @@ -980,7 +1047,7 @@ cmd_absorbgitdirs() while test $# != 0 && test -z "$command" do case "$1" in - add | foreach | init | deinit | update | status | summary | sync | absorbgitdirs) + add | foreach | init | deinit | update | set-branch | status | summary | sync | absorbgitdirs) command=$1 ;; -q|--quiet) @@ -1021,8 +1088,8 @@ then fi fi -# "-b branch" is accepted only by "add" -if test -n "$branch" && test "$command" != add +# "-b branch" is accepted only by "add" and "set-branch" +if test -n "$branch" && (test "$command" != add || test "$command" != set-branch) then usage fi @@ -1033,4 +1100,4 @@ then usage fi -"cmd_$command" "$@" +"cmd_$(echo $command | sed -e s/-/_/g)" "$@" diff --git a/t/t7419-submodule-set-branch.sh b/t/t7419-submodule-set-branch.sh new file mode 100755 index 0000000000..c4b370ea85 --- /dev/null +++ b/t/t7419-submodule-set-branch.sh @@ -0,0 +1,93 @@ +#!/bin/sh +# +# Copyright (c) 2019 Denton Liu +# + +test_description='Test submodules set-branch subcommand + +This test verifies that the set-branch subcommand of git-submodule is working +as expected. +' + +TEST_NO_CREATE_REPO=1 +. ./test-lib.sh + +test_expect_success 'submodule config cache setup' ' + mkdir submodule && + (cd submodule && + git init && + echo a >a && + git add . && + git commit -ma && + git checkout -b topic && + echo b >a && + git add . && + git commit -mb + ) && + mkdir super && + (cd super && + git init && + git submodule add ../submodule && + git commit -m "add submodule" + ) +' + +test_expect_success 'ensure submodule branch is unset' ' + (cd super && + test_must_fail grep branch .gitmodules + ) +' + +test_expect_success 'test submodule set-branch --branch' ' + (cd super && + git submodule set-branch --branch topic submodule && + grep "branch = topic" .gitmodules && + git submodule update --remote && + cat <<-\EOF >expect && + b + EOF + git -C submodule show -s --pretty=%s >actual && + test_cmp expect actual + ) +' + +test_expect_success 'test submodule set-branch --default' ' + (cd super && + git submodule set-branch --default submodule && + test_must_fail grep branch .gitmodules && + git submodule update --remote && + cat <<-\EOF >expect && + a + EOF + git -C submodule show -s --pretty=%s >actual && + test_cmp expect actual + ) +' + +test_expect_success 'test submodule set-branch -b' ' + (cd super && + git submodule set-branch -b topic submodule && + grep "branch = topic" .gitmodules && + git submodule update --remote && + cat <<-\EOF >expect && + b + EOF + git -C submodule show -s --pretty=%s >actual && + test_cmp expect actual + ) +' + +test_expect_success 'test submodule set-branch -d' ' + (cd super && + git submodule set-branch -d submodule && + test_must_fail grep branch .gitmodules && + git submodule update --remote && + cat <<-\EOF >expect && + a + EOF + git -C submodule show -s --pretty=%s >actual && + test_cmp expect actual + ) +' + +test_done