From patchwork Fri Jul 10 02:47:01 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: 11655495 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 E3AED1709 for ; Fri, 10 Jul 2020 02:48:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C550520663 for ; Fri, 10 Jul 2020 02:48:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="shQSksTj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727050AbgGJCsf (ORCPT ); Thu, 9 Jul 2020 22:48:35 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:40396 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726509AbgGJCsa (ORCPT ); Thu, 9 Jul 2020 22:48:30 -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 6B10460A63; Fri, 10 Jul 2020 02:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1594349308; bh=xONRVFMbeUNTWJhjr6yjUweg6MMbDDmOXThrZ0L9g9s=; 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=shQSksTjsueJ1ysrB9fWhpdhXfUjjWYcOAmUyQw3OR3k64lIdVYwpH6TbxqfDHjxI fzZvcpCMADt/9IJxxBfMBZqvi1+3/9UKlg/AYGYPDwgrVYJjnSFfi1BxlPClFGP2Js 3kO0QMGd/PCrG0uFeWdq11S7lLg9Yy7Tg978NeuDt/FFt8uOXVheObWo/t8Qrh85dh 9W4ugQv2GOiY1S4EuaIrKNf+EzFsrx9u7wdc14tKc2IXCc2Sk/MGetFQRd6LxRW4Fk 3zDJ9URq1iogForVHXHhowTGoUnwWDeMvgtDvkz2nyC29447N8RBY/iMs//7LMWKSn PA1Gpx1XUkMbiPjORTGx/O+rlWa+W4BWVDZCJQk0NTbQvDGB279yJC3lrJzv/DRE7t Tzy24MFIfeOv7qEzg4ncA1mMIg95uVSQunI9/QUrki2SGlrArB9Wld/nj5K5LjKAYX IzyZU71wuAq5mJaowEQq3jUbUz7ZdWo0v4lQ8KhwkP234k3OoGq From: "brian m. carlson" To: Cc: Johannes Schindelin Subject: [PATCH 11/38] t7063: make hash size independent Date: Fri, 10 Jul 2020 02:47:01 +0000 Message-Id: <20200710024728.3100527-12-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 Use test_oid instead of hard-coding a fixed size all-zeros object ID. Signed-off-by: brian m. carlson --- t/t7063-status-untracked-cache.sh | 155 ++++++++++++++++-------------- 1 file changed, 83 insertions(+), 72 deletions(-) diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh index 428cff9cf3..8880dd2ef8 100755 --- a/t/t7063-status-untracked-cache.sh +++ b/t/t7063-status-untracked-cache.sh @@ -75,14 +75,24 @@ test_expect_success 'setup' ' touch one two three done/one dtwo/two dthree/three && git add one two done/one && : >.git/info/exclude && - git update-index --untracked-cache + git update-index --untracked-cache && + test_oid_cache <<-EOF + root sha1:e6fcc8f2ee31bae321d66afd183fcb7237afae6e + root sha256:b90c672088c015b9c83876e919da311bad4cd39639fb139f988af6a11493b974 + + exclude sha1:13263c0978fb9fad16b2d580fb800b6d811c3ff0 + exclude sha256:fe4aaa1bbbbce4cb8f73426748a14c5ad6026b26f90505a0bf2494b165a5b76c + + done sha1:1946f0437f90c5005533cbe1736a6451ca301714 + done sha256:7f079501d79f665b3acc50f5e0e9e94509084d5032ac20113a37dd5029b757cc + EOF ' test_expect_success 'untracked cache is empty' ' test-tool dump-untracked-cache >../actual && cat >../expect-empty <../dump.expect <../actual && cat >../expect <../actual && cat >../expect <../actual && cat >../expect <../actual && cat >../expect <../actual && cat >../expect <../actual && cat >../expect <../actual && cat >../expect <../actual && cat >../expect <../actual && cat >../expect <../actual && cat >../expect-from-test-dump <../actual && @@ -806,8 +817,8 @@ test_expect_success '"status" after file replacement should be clean with UC=tru test-tool dump-untracked-cache >../actual && grep -F "recurse valid" ../actual >../actual.grep && cat >../expect.grep <