From patchwork Fri Apr 12 09:37:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood via GitGitGadget X-Patchwork-Id: 10897707 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 E53731800 for ; Fri, 12 Apr 2019 09:37:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDCE728D18 for ; Fri, 12 Apr 2019 09:37:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C21A528D62; Fri, 12 Apr 2019 09:37:28 +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 7C7EB28D2E for ; Fri, 12 Apr 2019 09:37:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726886AbfDLJhZ (ORCPT ); Fri, 12 Apr 2019 05:37:25 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:41290 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726872AbfDLJhX (ORCPT ); Fri, 12 Apr 2019 05:37:23 -0400 Received: by mail-ed1-f68.google.com with SMTP id g6so3788775edc.8 for ; Fri, 12 Apr 2019 02:37:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=cfj03u7cjqe525OLOvGdFTd7m0oyq4qTfT+sl2XCBrk=; b=sSaBbSpxnsz0tS1HBP7kN1OesOpu+WjD3u82wKq+A2l1tJ/TC5uldXoC8gJVCgNUrM WYy2sRes9Hdho0nAZ+nFwdStnZsgf/LBIljFOttoOWvJbt4YxSQOzqGpxP+ufyIvVoGO 0nk5oBaNMi+jIQE+sCkw4P2amg5m9u2rZnkwD6mRD+2xooNVX+RshsNNA1k4typ8ijR8 ErKjVXAhKCIk51Z5FS70I0/1D6ryQ1y02xnUyQgSS5/YaRilErpKO66QOcDmjKECb3fV ftFpb9U4qFVXQEQDe943N5+roJzxyQxyFvcx3eyVVMYIZmONQ05zHHy46Evc+xIzmzqh EIWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=cfj03u7cjqe525OLOvGdFTd7m0oyq4qTfT+sl2XCBrk=; b=KD5P4sucfRjEiADn54R16rorEo2J7lJHlwaaCeJdX5COdMEbl/58ithQGmb4aexq0X pHoiSAVtsXLOwgED4C+TdwAExi/fNOHHw2/pDoRWA5QgnXZniYq+n2apcY8oOW1b1nje Dy7jVhJ7hIdRBnQt31zIWRWdR0xaszQjSv3v19vNheReRBivzr9QXF3X2xYDyjMlCsiZ 48pG16sFWsNxjC/A6lAwW/BJlkOT6EKZmLTXIt1l+8raF3lJxd//GZiNTbF7r0IvMa87 BJKhwEPIlwB65xQfVRa1gshrkBceeL7GC3jq+BzF3rz/dKGSCNBV4kxw6ZLuIuR65uuc zD7g== X-Gm-Message-State: APjAAAVO2K5ygf53sc7kox70y1tVjNOfOpB74dqkHpt7mB9cKvxkJNdV Y/vP/P2zdrNOhMr10zdAK0quptT6 X-Google-Smtp-Source: APXvYqzPRV8sZWxg/RmAR/QWr7bigCk1FfkTx7xY/VALyQuCbcWWOouASJd55js8BBZ3IeZSSELGVw== X-Received: by 2002:a05:6402:150e:: with SMTP id f14mr29342075edw.33.1555061842090; Fri, 12 Apr 2019 02:37:22 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id j10sm7459613eja.58.2019.04.12.02.37.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 02:37:21 -0700 (PDT) Date: Fri, 12 Apr 2019 02:37:21 -0700 (PDT) X-Google-Original-Date: Fri, 12 Apr 2019 09:37:13 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 4/8] t5531: avoid using an abbreviated option Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Denton Liu , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin It was probably just an oversight: the `--recurse-submodules` option puts the term "submodules" in the plural form, not the singular one. To avoid future problems in case that another option is introduced that starts with the prefix `--recurse-submodule`, let's just fix this. Signed-off-by: Johannes Schindelin --- t/t5531-deep-submodule-push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh index e2c37fd978..4ad059e6be 100755 --- a/t/t5531-deep-submodule-push.sh +++ b/t/t5531-deep-submodule-push.sh @@ -363,7 +363,7 @@ test_expect_success 'push succeeds if submodule has no remote and is on the firs ) && git add b && git commit -m "added submodule" && - git push --recurse-submodule=check origin master + git push --recurse-submodules=check origin master ) '