From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id C5F091F51C for ; Mon, 21 May 2018 02:03:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752720AbeEUCDV (ORCPT ); Sun, 20 May 2018 22:03:21 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:51064 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752711AbeEUCDP (ORCPT ); Sun, 20 May 2018 22:03:15 -0400 Received: from genre.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:fc4d:8d90:22bd:91d8]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id E08976047A; Mon, 21 May 2018 02:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1526868194; bh=bpafkCnGWOXAkjZtfjwOidjLfuBr/P8kAJMRSTCyA+s=; 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=RRKfj1LGJ98PdDlYZEu0zJzlb2gKWOQa3mvAVrrTxIFbySEktYZ8Yxsu9C02oYrWj VZDdT8Dgc0x/SyvhNaGLdpocbQd/SpMD5dUQd4wGed7CzXezCCfAuvXGPWEA2vHXuL +/FQPZLhUq+0fi1/8DxYcRxIPEO9iUUNK/ZfZ7t3Bsfv87m9EdrAy+w/nJi/bpGmYj WSRzTj11c9egR2Em7HVHe7jEEhZ0hNvKitAYh/92kxHBdRvkc8gHcTZr9enARHeCcO a2n4wAdysKQ8FUnAn1mHXNbr/w5BQKza93YLoBk8z64WTaPFI7h8skQVolUCAswN4O EbCJbwqZGyw2Q/1XIP2rJWG+uh6hn80KCUEINoMIjIrizN14K63BunhWtUbvdktFrx /Mpxk2921Kz5sCDnS4TpifxgZUTwW5wn5aJALEpe1wVyd8iPNQ+DDDLM+S2fkHfB/d Qoo28lMahypexVHl0709yvHo29B1t54nadps67V28nArxD9n0jF From: "brian m. carlson" To: git@vger.kernel.org Cc: Junio C Hamano , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= , =?UTF-8?q?Martin=20=C3=85gren?= , Eric Sunshine , Johannes Sixt , Stefan Beller Subject: [PATCH v4 23/28] t/lib-diff-alternative: abstract away SHA-1-specific constants Date: Mon, 21 May 2018 02:01:42 +0000 Message-Id: <20180521020147.648496-24-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d In-Reply-To: <20180521020147.648496-1-sandals@crustytoothpaste.net> References: <20180516015630.661349-1-sandals@crustytoothpaste.net> <20180521020147.648496-1-sandals@crustytoothpaste.net> X-Scanned-By: MIMEDefang 2.79 on 127.0.1.1 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Adjust the test code so that it computes variables for blobs instead of using hard-coded hashes. This makes t4033 and t4050 (the patience and histogram tests) pass. Signed-off-by: brian m. carlson --- t/lib-diff-alternative.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/t/lib-diff-alternative.sh b/t/lib-diff-alternative.sh index 8b4dbf22d2..8d1e408bb5 100644 --- a/t/lib-diff-alternative.sh +++ b/t/lib-diff-alternative.sh @@ -59,9 +59,11 @@ int main(int argc, char **argv) } EOF - cat >expect <<\EOF + file1=$(git rev-parse --short $(git hash-object file1)) + file2=$(git rev-parse --short $(git hash-object file2)) + cat >expect <expect <<\EOF + uniq1=$(git rev-parse --short $(git hash-object uniq1)) + uniq2=$(git rev-parse --short $(git hash-object uniq2)) + cat >expect <