From patchwork Fri Jul 10 02:46:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "brian m. carlson" X-Patchwork-Id: 11655523 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 A8759739 for ; Fri, 10 Jul 2020 02:49:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8FD5D20708 for ; Fri, 10 Jul 2020 02:49:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="aqIehHrl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727854AbgGJCtD (ORCPT ); Thu, 9 Jul 2020 22:49:03 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:40482 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727837AbgGJCs7 (ORCPT ); Thu, 9 Jul 2020 22:48:59 -0400 Received: from camp.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:b610:a2f0:36c1:12e3]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id 8B64F60A5E; Fri, 10 Jul 2020 02:48:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1594349307; bh=+PqxO8ska++rKIP2kfK1D/tpsnkaFSXfLGOy/Y1ZYlw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Reply-To: Subject:Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc: In-Reply-To:References:Content-Type:Content-Disposition; b=aqIehHrlvZpNuyF+s3+QR0qtAf5UKhQv6J2p9qPY2FDyBpGHaaKKe+pYfmUQgjM09 BpNcwLeWgDSYHFw33Uvi21SdGfvdz1BBghzsaSd6hejwiRZRqlIflMrwVrrYAaAWdl ZFfFXL/gNc4YEzMklH4Jf/iqS2eXpCOjLF+aCRKsWm5c+b5D6G5z2zc+Q/7c5gXfx6 rcYD8ZoyZNELB1ugdFBlZGhe0GhgFZxD3mS/2g+2VIkUsO3ioD4VfXoiU+XXYjhlCL WbQ2zEU66ONJYxauXm7TWr7TGpTxtxwoDLJKQISqRvaFr5NLzn8anM23D8KZyvXH1a +4lYDvx44V4mRTgzFMLHLv+JUVn7f0fHIawJdDZ1hyO7c5XVktrwZFRpV1LMaLGC67 VVREdUB6fqYhivCOCGsNfIsnb4jTaCaGwCCjpKIU69f1whmeB97TCwSnTK4c/+nUKc rK6/loX3MEn+b5TmBkqhJ0DmTD3gLEzC9H1A5tqQBuva8fSRS7e From: "brian m. carlson" To: Cc: Johannes Schindelin Subject: [PATCH 09/38] t6501: avoid hard-coded objects Date: Fri, 10 Jul 2020 02:46:59 +0000 Message-Id: <20200710024728.3100527-10-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.27.0.353.gb9a2d1a020 In-Reply-To: <20200710024728.3100527-1-sandals@crustytoothpaste.net> References: <20200710024728.3100527-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This test contains hard-coded invalid object IDs. Make it hash size independent by generating invalid object IDs using the translation tables. Add a setup target to ensure the output of test_oid_init is checked properly. Signed-off-by: brian m. carlson --- t/t6501-freshen-objects.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/t/t6501-freshen-objects.sh b/t/t6501-freshen-objects.sh index f30b4849b6..7416ed5ffe 100755 --- a/t/t6501-freshen-objects.sh +++ b/t/t6501-freshen-objects.sh @@ -45,6 +45,10 @@ maybe_repack () { fi } +test_expect_success 'setup' ' + test_oid_init +' + for repack in '' true; do title=${repack:+repack} title=${title:-loose} @@ -128,9 +132,9 @@ for repack in '' true; do done test_expect_success 'do not complain about existing broken links (commit)' ' - cat >broken-commit <<-\EOF && - tree 0000000000000000000000000000000000000001 - parent 0000000000000000000000000000000000000002 + cat >broken-commit <<-EOF && + tree $(test_oid 001) + parent $(test_oid 002) author whatever 1234 -0000 committer whatever 1234 -0000 @@ -143,8 +147,8 @@ test_expect_success 'do not complain about existing broken links (commit)' ' ' test_expect_success 'do not complain about existing broken links (tree)' ' - cat >broken-tree <<-\EOF && - 100644 blob 0000000000000000000000000000000000000003 foo + cat >broken-tree <<-EOF && + 100644 blob $(test_oid 003) foo EOF tree=$(git mktree --missing stderr && @@ -153,8 +157,8 @@ test_expect_success 'do not complain about existing broken links (tree)' ' ' test_expect_success 'do not complain about existing broken links (tag)' ' - cat >broken-tag <<-\EOF && - object 0000000000000000000000000000000000000004 + cat >broken-tag <<-EOF && + object $(test_oid 004) type commit tag broken tagger whatever 1234 -0000