From patchwork Mon Jan 13 12:38:41 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: 11330015 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 BA0B213A0 for ; Mon, 13 Jan 2020 12:40:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F34921739 for ; Mon, 13 Jan 2020 12:40:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="kcXx0I1s" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728665AbgAMMki (ORCPT ); Mon, 13 Jan 2020 07:40:38 -0500 Received: from injection.crustytoothpaste.net ([192.241.140.119]:37648 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728558AbgAMMkh (ORCPT ); Mon, 13 Jan 2020 07:40:37 -0500 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 C0D9F607FC; Mon, 13 Jan 2020 12:40:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1578919236; bh=mIwoqfHulxI3nfouEXs/ZFmD4ZJN/5zDeL9TJnaR+wU=; 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=kcXx0I1s/E1MvZTsfUZMmjofPeDkwLnLSXi4Gr7oOzV8a3Lj0dJJ9BQyXOvYKG+bq gjK/mGv3QHSVhPHYsHMe/O8ow+KRodALRMncBOvbys6NW5JVZBrrdVz6HXajuRCjsE EIuZL9orNw/VLWTcn0kal+wPbI3ypHLC3y82Fc63/0LMco57s05VQQXmEOTTd0s63/ jpYgwpGuEXs4Ct9Y37PB+ORWmoELDJwR/TYDlhPtJ3mFNiD6R4pHcfC5phA44mf7ML lfzrCpV+2460RZNbCFULV3W83lbRiUO+1fZtfkk3EDgigYiSXpOP7LFPvQa2Y3Q0At 123CpkU1AkaAVFPO7bmnpD1o5sFPzY6jfOTDVTFOaEEG4YOTV4Q1o6aMUg5+QQJJU2 cxzQkpWZWe32YyBWaP5hvz72jNJSRRvzlj/9SP/JLPTI1cEWtjStef7ydkrPRFL9Mk vkNrqP72Rg5A6NMl+sUhSFAswiBrz5HPMKdFHjxwXU1zmDgvibH From: "brian m. carlson" To: Cc: Jonathan Tan , Johannes Schindelin Subject: [PATCH 08/24] t3404: remove SHA1 prerequisite Date: Mon, 13 Jan 2020 12:38:41 +0000 Message-Id: <20200113123857.3684632-9-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.25.0.rc2.338.g21a285fb81 In-Reply-To: <20200113123857.3684632-1-sandals@crustytoothpaste.net> References: <20200113123857.3684632-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 Despite the description in the test, the test does not actually test for an SHA-1 collision; none of the object IDs used in the test collide. As such, it does not need to be adjusted in any way for SHA-256, so remove the SHA1 prerequisite. Signed-off-by: brian m. carlson --- t/t3404-rebase-interactive.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index ae6e55ce79..682c7252b8 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1249,7 +1249,7 @@ test_expect_success 'rebase -i error on commits with \ in message' ' test_expect_code 1 grep " emp" error ' -test_expect_success SHA1 'short SHA-1 setup' ' +test_expect_success 'short SHA-1 setup' ' test_when_finished "git checkout master" && git checkout --orphan collide && git rm -rf . && @@ -1261,7 +1261,7 @@ test_expect_success SHA1 'short SHA-1 setup' ' ) ' -test_expect_success SHA1 'short SHA-1 collide' ' +test_expect_success 'short SHA-1 collide' ' test_when_finished "reset_rebase && git checkout master" && git checkout collide && (