From patchwork Wed Nov 18 14:49:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11915287 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9DAAAC6369E for ; Wed, 18 Nov 2020 14:49:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1F338246AA for ; Wed, 18 Nov 2020 14:49:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QoLvnMDX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727068AbgKROtN (ORCPT ); Wed, 18 Nov 2020 09:49:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725446AbgKROtM (ORCPT ); Wed, 18 Nov 2020 09:49:12 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09D20C0613D6 for ; Wed, 18 Nov 2020 06:49:12 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id a186so486599wme.1 for ; Wed, 18 Nov 2020 06:49:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=2mNOzwo2Tn5UKz5LNBWBBqX0xWHHgQYpZhjmTdgrWPA=; b=QoLvnMDX+SbusGZcMtisS2OfiuYZYtuZV3Bqy7sT4IMy0VDiP5J7kG4XNALT6N9acI sgBkBxRbd+KIULkZGraiF2zB/mALT4NDdSXG9w/BIbJj9lenlxzlaO937lhtd6v+aMxm 53aEXcpyrXApzFP9pPg3wBmII6jawm5RaEYJPVQYkgceN58FlQOwYgA7yxMIk/2/+aZg 1pc6rHFyt/NymDE+fwZL1CeLn44Kf/2OG6/oFH44Qph5yjrnOWgtCWIwDvKn7XsPngoe bLLgcw+r/Cjg8KvTsB5fBqKIP6R4wlq0kzewN4tBZGHHtP5R2iz1QeUOMEa6hH0vC/P5 WW+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=2mNOzwo2Tn5UKz5LNBWBBqX0xWHHgQYpZhjmTdgrWPA=; b=F7U2aoqoWcvXL5VFfXQSpzhohrgQWNufUWmAumwf9BjFHELtVx2c17PTXnJBzUBCYT 1xiCZfPtFWsx7uMNTY3OTVVMt9w3N8NpbnoopuM1nIaTns0D/cP0anO4KiVDMj+fAE9i tCMXm0WoVmAVlVBc7XnCt37y2RWxBjYvStborPIH01r/ub5ksX38zjrjETnlxhWWv5rG rRsg7+fGy87sFnGfybIMc4ws5RBZfShhhStpM8EhX4APEu59MoqapCFd2v1gqkwfyC+K S+WgR8ma+RUE2rrG+SvgXFP067XovDwiO3NWtG+1ybEMd4Ln6q5/uBcRkC9+7G/Tv8dw RwLQ== X-Gm-Message-State: AOAM533R3FqYn+Y3DUzT4wQqadZV00UbvP0ZPAJieOZnOT5qHWcpAYzp zgnoib2uHryJ+hGsXkSClC13IOax83o= X-Google-Smtp-Source: ABdhPJwJ8u5BbojY/AsCIPW25zv6iC1MjkFhWweCS4HcNAovHY9PifyppNkKRlqJmnlE7kNjfUSGpA== X-Received: by 2002:a7b:c14f:: with SMTP id z15mr420528wmi.174.1605710949339; Wed, 18 Nov 2020 06:49:09 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 17sm10517589wma.3.2020.11.18.06.49.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 06:49:09 -0800 (PST) Message-Id: <74828089e672024fd6e4aa23675939fe5b11eda2.1605710947.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Wed, 18 Nov 2020 14:49:05 +0000 Subject: [PATCH 1/3] t2106: adjust style to the current conventions Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin We settled on the style where the test cases' code starts by the opening single quote being on the `test_expect_*` line, and the closing quote being in its own line after the code. Signed-off-by: Johannes Schindelin --- t/t2106-update-index-assume-unchanged.sh | 30 +++++++++++++----------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/t/t2106-update-index-assume-unchanged.sh b/t/t2106-update-index-assume-unchanged.sh index 99d858c6b7..ff0947f388 100755 --- a/t/t2106-update-index-assume-unchanged.sh +++ b/t/t2106-update-index-assume-unchanged.sh @@ -5,20 +5,22 @@ test_description='git update-index --assume-unchanged test. . ./test-lib.sh -test_expect_success 'setup' \ - ': >file && - git add file && - git commit -m initial && - git branch other && - echo upstream >file && - git add file && - git commit -m upstream' +test_expect_success 'setup' ' + : >file && + git add file && + git commit -m initial && + git branch other && + echo upstream >file && + git add file && + git commit -m upstream +' -test_expect_success 'do not switch branches with dirty file' \ - 'git reset --hard && - git checkout other && - echo dirt >file && - git update-index --assume-unchanged file && - test_must_fail git checkout master' +test_expect_success 'do not switch branches with dirty file' ' + git reset --hard && + git checkout other && + echo dirt >file && + git update-index --assume-unchanged file && + test_must_fail git checkout master +' test_done From patchwork Wed Nov 18 14:49:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11915283 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E2EAC63777 for ; Wed, 18 Nov 2020 14:49:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D96F2246EA for ; Wed, 18 Nov 2020 14:49:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KnI5RQFE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727089AbgKROtO (ORCPT ); Wed, 18 Nov 2020 09:49:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726293AbgKROtN (ORCPT ); Wed, 18 Nov 2020 09:49:13 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5308CC0613D4 for ; Wed, 18 Nov 2020 06:49:11 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id l1so2438159wrb.9 for ; Wed, 18 Nov 2020 06:49:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=9ClbEGP51hte3bm0dkdO9d3zCmtWg9VI6aNW22WM6T0=; b=KnI5RQFEmE8abLUYP4XKm+wz7Xv10PG0LMDT26c1c0aq9mmJzEYy0ImmvkolyQORlm CIWu3S/KGAT9/oMcN+JiVWaNm8ye3BqXZ2sf/uNOG/TXZOs1I/qqn3IVAGoydKYhhwY/ 1CQptPwwhVhkGMloNpYB11F6DtvHrQz9hFUlS8WR3K6xLkaYOUMv3O0Lv6q18VraEHKz Ly5XLPOkyTHc/5FtfpmrS8LH7MSGzr3mYsUSy67FGUDPbptykaSiCgL4TcQsPCMUHEif 7yML06ijM+tM8iEVDYd7wSWNij3ywvywuunM2zkhRPgBwfoKgjSt3BsXFMlsTuwSfFDB oAyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=9ClbEGP51hte3bm0dkdO9d3zCmtWg9VI6aNW22WM6T0=; b=qWT53NdtC7xon+BiXWUB6tQzSWP5xZYDjzgcPao9OimqlO5qOmqYLC1Bf1hhI+glsm J/BAyCZT+rvholr3307QybxDNK7dfPXiUbEOJXUl7blay1up3OLt0EspBuEgq7FxQwW3 /W0+VZPpVOSdT/ra3mKTQcUjFFWj1HFhTPhqrxHXossZnHsXT6ef6ejAbx1YkQJfO0mw YvFmpE5Pvn7NQ2NshelNHXorjpylKUE+8TC6Mk06kWlTz5rAAOxFljRWmzVy+gC0Mgcp m14YC639qEF+UaXer9hZ/MO5B7Q3Q/vUpgrdfrUMce1dlOo7kO1aA9ZoxqHvLdTufemy aNhg== X-Gm-Message-State: AOAM53303Vk9tv/qjUZER0d2lImz0d0mmtNOcHrHkALhNZTIX3r1Izex VuE/K5dWChDFEIPBmRFqqyyNm6Lr5kM= X-Google-Smtp-Source: ABdhPJy0x3OQX/Drzrn5+1F9vgnumoTc1uLRyQtMXVPYn3Glvrb01/iHw960L/G9fOs6wa15IQedCw== X-Received: by 2002:adf:9e4c:: with SMTP id v12mr5002077wre.22.1605710949990; Wed, 18 Nov 2020 06:49:09 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 60sm30761371wrs.69.2020.11.18.06.49.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 06:49:09 -0800 (PST) Message-Id: In-Reply-To: References: Date: Wed, 18 Nov 2020 14:49:06 +0000 Subject: [PATCH 2/3] t2106: make test independent of the current main branch name Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin We do have this wonderful shortcut `git checkout -` to go back to the previous branch, thanks to the reflog. Signed-off-by: Johannes Schindelin --- t/t2106-update-index-assume-unchanged.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t2106-update-index-assume-unchanged.sh b/t/t2106-update-index-assume-unchanged.sh index ff0947f388..3396f23363 100755 --- a/t/t2106-update-index-assume-unchanged.sh +++ b/t/t2106-update-index-assume-unchanged.sh @@ -20,7 +20,7 @@ test_expect_success 'do not switch branches with dirty file' ' git checkout other && echo dirt >file && git update-index --assume-unchanged file && - test_must_fail git checkout master + test_must_fail git checkout - ' test_done From patchwork Wed Nov 18 14:49:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 11915285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDCD9C63798 for ; Wed, 18 Nov 2020 14:49:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6017D246EA for ; Wed, 18 Nov 2020 14:49:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="exRrj3I9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727171AbgKROtP (ORCPT ); Wed, 18 Nov 2020 09:49:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726293AbgKROtP (ORCPT ); Wed, 18 Nov 2020 09:49:15 -0500 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17FD0C0613D4 for ; Wed, 18 Nov 2020 06:49:15 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id c9so3269287wml.5 for ; Wed, 18 Nov 2020 06:49:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=9qslaTPO+s7Jj3mATmmfB/HDokSEiRFEEkxLgAF/jQI=; b=exRrj3I9Er2LweYMiObriR5CioJAsSaRbZLQay2BzY1ZTtb+iJtwoQIOuSH6RdDCOG hLTfMlND0EKG3SQ5g4eEpcIWdwkORkLyLY7eDTpB1PyxPspJv5Pnry+AxkyAc/exnoWl Dm1T9+q4iD/+snQ4MpLM0Qa2dxnFUdZGA9W1fJXuxloKYpLoHYdVFBDheONBsAbXs2Oy bkeRAlgh9QLZ9ib8cEhWWV4HHXCaBSXyqsSzdRh8uKeuNfBeafXAE9Dagk+m+pCSCL+t G/NPJhMFMlZyl9Z1lt66Nj91yYthNWywz3hXmzYHixUhB3tq1PjBgL8DBgxR2DQLjaJK NPzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=9qslaTPO+s7Jj3mATmmfB/HDokSEiRFEEkxLgAF/jQI=; b=bT4hHJZQ5HBg2kqftIVnKazaDhEq4q3DSNb2llgxYJ7tueYFNSNtsrqBidrZqPjDmr Hqtojgxd34OvvuGz/ZI8+TS183XgUG3a0u2lIab6mlVljFE6XPL8XwLaD309NSk18Wk7 QygV199C/pjEZ14Y02nNfq7dTaw5nFEBb5rHvUUGzU4e8a2w00ZvX7NAh8pmCGJOEchE 1hI22P+JFe+aL0HJvWtNtYDBQyws4Zu3q4fempWzzEzQjcWu2aonLitWfWFojyWdRrLW /9Kir57BjSn9d3aaQ+CflTl91G9xuAD4fsG2lcJx/EyiYCEghZnmCrVmOPuFEpyOZbs+ P8Gw== X-Gm-Message-State: AOAM531KEhrJMze60MtqkWnquNv3vBnQVrSIodOzTtpNnlyIMY6+X1eJ zQT2/WeqdEuUYoCNC6opv9tC1o+oWVs= X-Google-Smtp-Source: ABdhPJyJINgBKH1366g5aLm28O0yLWfdQD/M2hW2VXgnJDZnP+LNVDiJwQwfKu9iKS4najmRiebwsg== X-Received: by 2002:a7b:c92a:: with SMTP id h10mr417383wml.138.1605710950786; Wed, 18 Nov 2020 06:49:10 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e6sm4031324wme.27.2020.11.18.06.49.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 06:49:10 -0800 (PST) Message-Id: <7a750f1317143bf4488c21bd11c4e59558a3d7c6.1605710947.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Wed, 18 Nov 2020 14:49:07 +0000 Subject: [PATCH 3/3] t2106: ensure that the checkout fails for the expected reason Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin During the transition of the test suite to a new default branch name, it was noticed that this test case succeeded for the wrong reason when the default branch name was overridden. While we fixed that in the previous commit, let's make sure that we look for a tell-tale in the error message that the `git checkout` failed for the reason we wanted it to fail. Signed-off-by: Johannes Schindelin --- t/t2106-update-index-assume-unchanged.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t2106-update-index-assume-unchanged.sh b/t/t2106-update-index-assume-unchanged.sh index 3396f23363..2d450daf5c 100755 --- a/t/t2106-update-index-assume-unchanged.sh +++ b/t/t2106-update-index-assume-unchanged.sh @@ -20,7 +20,8 @@ test_expect_success 'do not switch branches with dirty file' ' git checkout other && echo dirt >file && git update-index --assume-unchanged file && - test_must_fail git checkout - + test_must_fail git checkout - 2>err && + test_i18ngrep overwritten err ' test_done