From patchwork Wed Jul 29 23:14:09 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: 11691915 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 BF21214DD for ; Wed, 29 Jul 2020 23:15:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9E79220809 for ; Wed, 29 Jul 2020 23:15:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="VpD9Vmee" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728089AbgG2XO7 (ORCPT ); Wed, 29 Jul 2020 19:14:59 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:41044 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728049AbgG2XO6 (ORCPT ); Wed, 29 Jul 2020 19:14: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 D9C9F61013; Wed, 29 Jul 2020 23:14:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1596064495; bh=L4ikSk2ksF5tOP+JVJ03gA5CEshYrAarLzuzOB/wnpw=; 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=VpD9VmeeUNoYYml7jg4YtfVu8ZIX8Drd92GWFxqST+fHfQb/2JV8M1Pd6d93z2TZK WXWspbAFbWLJ9sWGAfm44A49TVFcSzXborIjzgzYL6+NtNROzquMdkojjdXL5h8LcG I7Ubsy+ps2GipVjijL202DoUEi+mKaJGoaLp7qZC0XBcOctkQ1OTgvRucP+yKsxlUt N4s6zPIevw6Z1VE9zHVSYpE72qMbLMksm2MLJyabeQEQUR0GxnbABw7CudULMiQI+T mtPZVB4CikRrBvXPCS4Wv5ePxXlMOmLvdj5d4sG/LHGzDGUFGJMJaET1s+EIUj09zV eESRQBbjHV8OcCyawVY9cYpqWSsUkmR1Gl3wHCZjveL0wr0LBZW9PzwiYJL6POKqxa 9k3iFAtrm0Vx9dhZ2Hba7/Vc3PpsS/58c6GSNSmgSf6cZdKV41M7+APF3zSYmMNnmK 7WkeK8MfWEU6hfrWfz2zmGZv47tWqOdnFEx1BtpLL7QvJq70BCz From: "brian m. carlson" To: Cc: Eric Sunshine Subject: [PATCH v6 20/39] t8011: make hash size independent Date: Wed, 29 Jul 2020 23:14:09 +0000 Message-Id: <20200729231428.3658647-21-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.28.0.163.g6104cc2f0b6 In-Reply-To: <20200729231428.3658647-1-sandals@crustytoothpaste.net> References: <20200728233446.3066485-1-sandals@crustytoothpaste.net> <20200729231428.3658647-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 Allow lines which start with either a 40- or 64-character hex object ID, to allow for both SHA-1 and SHA-256. Signed-off-by: brian m. carlson --- t/t8011-blame-split-file.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t8011-blame-split-file.sh b/t/t8011-blame-split-file.sh index 831125047b..bdda0c03fe 100755 --- a/t/t8011-blame-split-file.sh +++ b/t/t8011-blame-split-file.sh @@ -54,7 +54,7 @@ test_expect_success 'setup simulated porcelain' ' cat >read-porcelain.pl <<-\EOF my $field = shift; while (<>) { - if (/^[0-9a-f]{40} /) { + if (/^[0-9a-f]{40,} /) { flush(); $hash = $&; } elsif (/^$field (.*)/) {