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 DB7CA1F51C for ; Mon, 21 May 2018 02:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752537AbeEUCDl (ORCPT ); Sun, 20 May 2018 22:03:41 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:51046 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752645AbeEUCDN (ORCPT ); Sun, 20 May 2018 22:03:13 -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 D9A3460749; Mon, 21 May 2018 02:03:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1526868192; bh=vqhEDAX66enHXwvH4Dbb71ck/56wkA9xwXomvQggeF4=; 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=Qijp+mamrjED6qeeAMQjjOaMwS+LqHqMvzEeFdfyYMGOviDxjC/bfe8T98LKykmO/ D8G1Mitk3Vd5+kB8wchEwwbqdNLjO5Xi7IhrrDJw52dNmSpC43M64VVVoqczDPvv5+ i4QjYHq76r8AQyxJcCDqXKg42f+ePg4kSXChilOtF3O9DsBO834zY3D+LYoK4pziCa D0p2ngogUoSWCwQ0W8G1p9DS4To5RDPkE9HQDuxyWzCSsi1gDek6MCLiNPVcap01qN pk9WuWxSU17kggFJxq6RnlvMZbvR/zp6wMu1pHD4S+v/cEO8usjxwGbpz7VdPTXl3O 0rEOrxO4Q40NKo7Fj4w+Gh2YjMLAembgFoD5PMAWNM/NSFDs+TBZs0IJWIHNDx4jXB xmizX0ZKgck3KRa9kfobnkPxBvngk/2Mvv54kkxEMO07MCNwROHWOfeDbSUCu4JdXc HHiQryoafpm+f0uUkYqF3HpLqGu5pHYIBZPuNB36RURDIx+UOpy 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 22/28] t4030: abstract away SHA-1-specific constants Date: Mon, 21 May 2018 02:01:41 +0000 Message-Id: <20180521020147.648496-23-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 so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson --- t/t4030-diff-textconv.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index aad6c7f78d..4cb9f0e523 100755 --- a/t/t4030-diff-textconv.sh +++ b/t/t4030-diff-textconv.sh @@ -148,7 +148,8 @@ test_expect_success 'diffstat does not run textconv' ' # restore working setup echo file diff=foo >.gitattributes -cat >expect.typechange <<'EOF' +symlink=$(git rev-parse --short $(printf frotz | git hash-object --stdin)) +cat >expect.typechange <expect.typechange <<'EOF' -1 diff --git a/file b/file new file mode 120000 -index 0000000..67be421 +index 0000000..$symlink --- /dev/null +++ b/file @@ -0,0 +1 @@