From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id ACC5E1F5B7 for ; Wed, 29 Jul 2020 23:15:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728104AbgG2XPC (ORCPT ); Wed, 29 Jul 2020 19:15:02 -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 S1726718AbgG2XO7 (ORCPT ); Wed, 29 Jul 2020 19:14:59 -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 D34E060CF7; Wed, 29 Jul 2020 23:14:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1596064496; bh=wVbIJyEXfbTnQyZJWmVPDavtLEJRJvrONnd47uNHDFU=; 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=0Fd1ks1tmRE5Lkz8s8Tn7yljxn3yhJtFhsfcarig5Abe4iIikaCpGXsOM1tLudqXA 6qdocjtsgUYk/DVQ3NgERwusyp7KZ9K4/kzr8KuR3pRQ4Iuj7g9rtwA/l/LlkttroD kjnm3nzIKEKGqa9h+RL1+Bp4sWDef2HPAKXcFOLFvoUTTbyP5P/7cD/jR4DVWiAptN +eTEQ3EjWSt4l3/Y67SNR0r7Vc9PhRDxJkhBW3a08k44XcYTZ0v7O0GnD41Yyk1S/O W7gJSaJjbOOL9ej6QXt/9MzCwiXL+UD7JMXjVuYgF7/aSQbXwM210aTYEHh7YwZ6Hw 7D+me1mnjMgwi7ZY9jW7akb1LyAWg6r0hC0pqTX4nyyEpKKsf7ASC+MaWxQIzC7Jkf tTnz6VNaT8mgSylfv8eRZ84d/Rx/38EKCTiApsAoulLKYs8jrXsiV3na7Ak60azclf 636xYvz/XE/qShndRzy+dHwjlYOYUmg0c7Z4EYgquPNfz4uivl1 From: "brian m. carlson" To: Cc: Eric Sunshine Subject: [PATCH v6 22/39] t9300: use $ZERO_OID instead of hard-coded object ID Date: Wed, 29 Jul 2020 23:14:11 +0000 Message-Id: <20200729231428.3658647-23-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 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: brian m. carlson --- t/t9300-fast-import.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index f2d2cb06ad..308c1ef42c 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -92,7 +92,7 @@ test_expect_success 'A: create pack from stdin' ' EOF reset refs/tags/to-be-deleted - from 0000000000000000000000000000000000000000 + from $ZERO_OID tag nested mark :6 @@ -102,7 +102,7 @@ test_expect_success 'A: create pack from stdin' ' EOF reset refs/tags/nested - from 0000000000000000000000000000000000000000 + from $ZERO_OID tag nested mark :7 @@ -286,7 +286,7 @@ test_expect_success 'A: verify pack' ' test_expect_success 'A: verify diff' ' copy=$(git rev-parse --verify master:file2) && cat >expect <<-EOF && - :000000 100755 0000000000000000000000000000000000000000 $copy A copy-of-file2 + :000000 100755 $ZERO_OID $copy A copy-of-file2 EOF git diff-tree -M -r master verify--import-marks >actual && compare_diff_raw expect actual && @@ -365,7 +365,7 @@ test_expect_success 'B: fail on invalid blob sha1' ' COMMIT from refs/heads/master - M 755 0000000000000000000000000000000000000001 zero1 + M 755 $(echo $ZERO_OID | sed -e "s/0$/1/") zero1 INPUT_END @@ -620,8 +620,8 @@ test_expect_success 'D: validate new files added' ' f5id=$(echo "$file5_data" | git hash-object --stdin) && f6id=$(echo "$file6_data" | git hash-object --stdin) && cat >expect <<-EOF && - :000000 100755 0000000000000000000000000000000000000000 $f6id A newdir/exec.sh - :000000 100644 0000000000000000000000000000000000000000 $f5id A newdir/interesting + :000000 100755 $ZERO_OID $f6id A newdir/exec.sh + :000000 100644 $ZERO_OID $f5id A newdir/interesting EOF git diff-tree -M -r branch^ branch >actual && compare_diff_raw expect actual @@ -2733,7 +2733,7 @@ test_expect_success 'R: corrupt lines do not mess marks file' ' rm -f io.marks && blob=$(echo hi | git hash-object --stdin) && cat >expect <<-EOF && - :3 0000000000000000000000000000000000000000 + :3 $ZERO_OID :1 $blob :2 $blob EOF @@ -3084,7 +3084,7 @@ test_expect_success 'T: delete branch' ' git branch to-delete && git fast-import <<-EOF && reset refs/heads/to-delete - from 0000000000000000000000000000000000000000 + from $ZERO_OID EOF test_must_fail git rev-parse --verify refs/heads/to-delete '