From patchwork Thu Oct 25 16:18:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Ospite X-Patchwork-Id: 10656157 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 1189117DE for ; Thu, 25 Oct 2018 16:18:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C37972BA56 for ; Thu, 25 Oct 2018 16:18:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B78E72BA63; Thu, 25 Oct 2018 16:18:34 +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,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 5F5FC2BA5F for ; Thu, 25 Oct 2018 16:18:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727808AbeJZAv7 (ORCPT ); Thu, 25 Oct 2018 20:51:59 -0400 Received: from mail.ao2.it ([92.243.12.208]:44350 "EHLO ao2.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727635AbeJZAv7 (ORCPT ); Thu, 25 Oct 2018 20:51:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ao2.it; s=20180927; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=GORWD3oVSQScDCGqz1LXcjfE/Uf378/R248MvPcUhEQ=; b=ZRjHuFoTHlJCwAFKWgt8g0JJ8HXA7oO1xGfpo7dJThg5RvrI1PQOiGrFBU+MCb4Pc28IPBdqXU1K4hU6VjXNeFA9sIZcvefEdTJgmne1LWeCDLtOBl9px7tqHnFqzFBDuu56jQSkJyobDLOUCRFyQR5dLfIbm49qWXIPKzuI6gW9SbgBuUzla6AideFYBQnzEQNH4aCMuplXIcc3+FkTUgMCt0/QvhReZ2FQl1r+9BNgmCZbVW4lUPZkUjEIHbVQPrSIxStaqnQkRBsHKHq1VuGxk9L+vm+b0RAC72EPsF4SleX6ZXRcrKF6yc5pnEWbgPHeC2Zd1PpqeU76sM9bIg==; Received: from localhost ([::1] helo=jcn) by ao2.it with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1gFiKn-0003Kz-To; Thu, 25 Oct 2018 18:18:09 +0200 Received: from ao2 by jcn with local (Exim 4.91) (envelope-from ) id 1gFiL5-0004VH-9t; Thu, 25 Oct 2018 18:18:27 +0200 From: Antonio Ospite To: gitster@pobox.com Cc: git@vger.kernel.org, Jonathan Nieder , Stefan Beller , Jeff King , =?utf-8?q?SZ?= =?utf-8?q?EDER_G=C3=A1bor?= , Antonio Ospite Subject: [PATCH v7 04/10] t7411: be nicer to future tests and really clean things up Date: Thu, 25 Oct 2018 18:18:07 +0200 Message-Id: <20181025161813.17252-5-ao2@ao2.it> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181025161813.17252-1-ao2@ao2.it> References: <20181025161813.17252-1-ao2@ao2.it> MIME-Version: 1.0 X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM/Vb;]yA5\I~93>J<_`<4)A{':UrE Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Tests 5 and 7 in t/t7411-submodule-config.sh add two commits with invalid lines in .gitmodules but then only the second commit is removed. This may affect future subsequent tests if they assume that the .gitmodules file has no errors. Remove both the commits as soon as they are not needed anymore. Signed-off-by: Antonio Ospite --- t/t7411-submodule-config.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh index f2cd1f4a2c..b1f3c6489b 100755 --- a/t/t7411-submodule-config.sh +++ b/t/t7411-submodule-config.sh @@ -83,6 +83,8 @@ Submodule name: 'submodule' for path 'submodule' EOF test_expect_success 'error in history of one submodule config lets continue, stderr message contains blob ref' ' + ORIG=$(git -C super rev-parse HEAD) && + test_when_finished "git -C super reset --hard $ORIG" && (cd super && cp .gitmodules .gitmodules.bak && echo " value = \"" >>.gitmodules && @@ -115,6 +117,8 @@ test_expect_success 'using different treeishs works' ' ' test_expect_success 'error in history in fetchrecursesubmodule lets continue' ' + ORIG=$(git -C super rev-parse HEAD) && + test_when_finished "git -C super reset --hard $ORIG" && (cd super && git config -f .gitmodules \ submodule.submodule.fetchrecursesubmodules blabla && @@ -126,8 +130,7 @@ test_expect_success 'error in history in fetchrecursesubmodule lets continue' ' HEAD b \ HEAD submodule \ >actual && - test_cmp expect_error actual && - git reset --hard HEAD^ + test_cmp expect_error actual ) '