From patchwork Sat Mar 14 07:11:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11438693 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5A944159A for ; Sun, 15 Mar 2020 04:25:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 32DEC20724 for ; Sun, 15 Mar 2020 04:25:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fSE+5tz6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726278AbgCOEZv (ORCPT ); Sun, 15 Mar 2020 00:25:51 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:37199 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725995AbgCOEZv (ORCPT ); Sun, 15 Mar 2020 00:25:51 -0400 Received: by mail-wr1-f68.google.com with SMTP id 6so17054678wre.4 for ; Sat, 14 Mar 2020 21:25:49 -0700 (PDT) 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=pNTZUDjJPBSKm8DnqvbjiMFhIXpHTgA3IEGTERjokJ4=; b=fSE+5tz6rtk2NKwAR39b5YZ4uPIs4fXzQFbmADjVsAknKUtcrGBatnVwQeJ+ZwX176 2L7cOpJKV4kmaQUSJkIBcNA8A7xE0Sf0oBo9LbuLXNy/2IkYsLbrq7QI84H9GZ9MORPm VV7T7HDa+uF/Bl3Uen99ikjaOCf1wjNjLZ1JHn0EofbOXuqjPiN0OiK7VudnrWtRGoZ7 WSIQs/gQwYQWcF340qrFjD48rRSgv2G8VweEADlplLYSop+0hnaUugX3CgUWGD5FUbJZ QbW4icDoQL5tanyoWeXkKPQlIVKgRvbFLxzHfFqJHRCIpHeqnoor5G4huKqw5INx2nJh wceA== 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=pNTZUDjJPBSKm8DnqvbjiMFhIXpHTgA3IEGTERjokJ4=; b=eqmvssnkDeh01WQme4zJYa1NvoEGL02JqptzE4K/9VS1hA94Bt1UNVNdodr+2iUjNw pKVcz8ikU7THOgGTDeo1H6yRjjP4SSySubYTXrOprBxEnBKydsn75lQhWLCdR6JmWMP7 S1y0yC95z53jgqR3QfqHRKhDg0QpHnvXIpKCC/JmoZH7bESsKdswniwJMiJIG8Fn43na b7SBM1Q64i8TECBR5239I2dQrZdRaWUclXpqwDXnlIOu3+hAw/iidBjhQZIWZ2A+Cc+R 5/+/IN2O1EYHes/GKXZafoAM63nrjoJhQMcooeZSXW2fRJHCRxMZN6V7OQIc4EJ324JS vDcg== X-Gm-Message-State: ANhLgQ3AWouFTpqIod7Z3oENAg59K8LUj98UYMowB2k0oRn3en4j8OU7 Y84VSil4ozSUZIM2yak7P5XADyju X-Google-Smtp-Source: ADFU+vsJImX/OezvZGW1bGU8Ks9wne1GZIdWBPVtn4EM/aZLRyRyg/DsUD/Ok4OVy5VKQ1RVu0ssmw== X-Received: by 2002:a17:906:b888:: with SMTP id hb8mr14478082ejb.166.1584169896299; Sat, 14 Mar 2020 00:11:36 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id aq2sm1702998ejc.9.2020.03.14.00.11.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Mar 2020 00:11:35 -0700 (PDT) Message-Id: In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Sat, 14 Mar 2020 07:11:28 +0000 Subject: [PATCH 2/7] t1091: make some tests a little more defensive against failures Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Derrick Stolee , Elijah Newren , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren Signed-off-by: Elijah Newren --- t/t1091-sparse-checkout-builtin.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh index 44a91205d60..8607a8e6d1a 100755 --- a/t/t1091-sparse-checkout-builtin.sh +++ b/t/t1091-sparse-checkout-builtin.sh @@ -278,6 +278,7 @@ test_expect_success 'cone mode: add parent path' ' ' test_expect_success 'revert to old sparse-checkout on bad update' ' + test_when_finished git -C repo sparse-checkout disable && test_when_finished git -C repo reset --hard && git -C repo sparse-checkout set deep && echo update >repo/deep/deeper2/a && @@ -328,6 +329,7 @@ test_expect_success 'sparse-checkout (init|set|disable) fails with dirty status' ' test_expect_success 'cone mode: set with core.ignoreCase=true' ' + rm repo/.git/info/sparse-checkout && git -C repo sparse-checkout init --cone && git -C repo -c core.ignoreCase=true sparse-checkout set folder1 && cat >expect <<-\EOF &&