From patchwork Sun Jul 26 19:54:21 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: 11686073 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 C20191392 for ; Sun, 26 Jul 2020 19:55:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9FF3B20719 for ; Sun, 26 Jul 2020 19:55:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="VxQz070N" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728040AbgGZTzG (ORCPT ); Sun, 26 Jul 2020 15:55:06 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:40668 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728005AbgGZTy6 (ORCPT ); Sun, 26 Jul 2020 15:54:58 -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 5349E61013; Sun, 26 Jul 2020 19:54:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1595793297; bh=/Y2IAakbQXZRpXTcNI3dlWOYa+RXHLvR5qZqNy0IV9k=; 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=VxQz070NRP1iU6Ww2dgH5NyO/4kMswox7JBorvkW5W7o7GJqA8g+6yWKoKK5k6ZiE TYHOzF8G0P96s9RpLKT2NWExnmfaANYX3DyUeUStZSdJp2NK79Orw/IqaxNIWd8ZvB Pkb/Id0CZkBaznHZ8FMASaXAXZRfXk7DzGH1S6rg1eKdKsE4XgRvwDs6CvqXdASyxF MIpOTrxAg0kFDxq2N0rMQPDcy1uFmX18n7QFGjku0VA4zetzz8mJyMyGq1FycULC1H qKbteRbL5NSo4eaTW9XjnjG34/BBrqlo0T2BlHTc0x+3aJWiVEV6nKEWeX/txKCZ2Y OTuOLPbYsALzdX3EgKoQnkNkkEmCTaxCRlpZJSXm2q+D/gPNOKg641xWF0KX6bRY0z AIUAUVkzmrfJilJ6XKSquUusUtE0hihzQSHOW3iAOkeo6cv1sIOHBmyZ/G2W/DGSPS ny9uKm1tvLOOjfrU2pUdbsqKfdKm45Gs6Mav9Oyh1Pf9hwnYIvX From: "brian m. carlson" To: Cc: Eric Sunshine Subject: [PATCH v4 36/39] t: make SHA1 prerequisite depend on default hash Date: Sun, 26 Jul 2020 19:54:21 +0000 Message-Id: <20200726195424.626969-37-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.28.0.rc2.160.gd0b3904b262 In-Reply-To: <20200726195424.626969-1-sandals@crustytoothpaste.net> References: <20200726195424.626969-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 Currently, the SHA1 prerequisite depends on the output of git hash-object. However, in order for that to produce sane behavior, we must be in a repository. If we are not, the default will remain SHA-1, and we'll produce wrong results if we're using SHA-256 for the testsuite but the test assertion starts when we're not in a repository. Check the environment variable we use for this purpose, leaving it to default to SHA-1 if none is specified. Signed-off-by: brian m. carlson --- t/test-lib.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 307bb2207e..ea2d308f62 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1689,7 +1689,8 @@ test_lazy_prereq CURL ' # which will not work with other hash algorithms and tests that work but don't # test anything meaningful (e.g. special values which cause short collisions). test_lazy_prereq SHA1 ' - test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 + test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 && + { test -z "$GIT_DEFAULT_HASH" || test "$GIT_DEFAULT_HASH" = "sha1"; } ' test_lazy_prereq REBASE_P '