From patchwork Mon Jul 13 02:48:52 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: 11658561 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 09F846C1 for ; Mon, 13 Jul 2020 02:49:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E6681206D9 for ; Mon, 13 Jul 2020 02:49:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="gX7w/AC/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728597AbgGMCto (ORCPT ); Sun, 12 Jul 2020 22:49:44 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:40618 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728404AbgGMCte (ORCPT ); Sun, 12 Jul 2020 22:49:34 -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 AA50160A5C; Mon, 13 Jul 2020 02:49:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1594608574; bh=6IiTjepVMmW78lRHg0aX51WFBl7W5fj6oZtc81uw/dY=; 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=gX7w/AC/LZbumgzHoYdkDH6n2FUbXEALIkklA6B1UL2OF+84AzaRFmH5k6Kqu+YNg +v/UoRBl0L19GgTazmgeMzhlxmvvGhFmSxGkhPOJa/vTBWCZ6VFuDfrDO/KIt3a3fo nJyFmhK9HHBDyufLxhIvnwt/EI/G+ZY4NYFmVAEJpWtDTMLdQUkX+KsoiiAtE0uHhx 66dd5S8pKYynHfWQPsDOE22hwB1wWT4Wc2SfJJh62hqDFyey2XQLw+3hAfcef4TXyc L267z4KsV16TyeFdqt2b89v8/lcElzNHq5Ur6rpmKASH6RVwvGqklfebrbW4meOXew 1bplebNrJ/Ddjhp8xH+iTAithY2lTENGWvsuiosP5i7QzD0KRDmsBR/Al7ct3zbgaj 5IoS3xtqXsywMsv5ftHcZ1ze3+U1fx53oW/UKQEQbN6e07syFGYcFa02FCsizOU/e+ TTPw0F+gMtmdbvEa13+L3bH1ebQMjVPx5W7xkJn1PuOurFJOfSy From: "brian m. carlson" To: Cc: Denton Liu , Derrick Stolee Subject: [PATCH v2 22/39] t9300: use $ZERO_OID instead of hard-coded object ID Date: Mon, 13 Jul 2020 02:48:52 +0000 Message-Id: <20200713024909.3714837-23-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.27.0.353.gb9a2d1a020 In-Reply-To: <20200713024909.3714837-1-sandals@crustytoothpaste.net> References: <20200713024909.3714837-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 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 69d6fa4127..f4b3f5eaf9 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 @@ -285,7 +285,7 @@ test_expect_success 'A: verify pack' ' test_expect_success 'A: verify diff' ' cat >expect <<-EOF && - :000000 100755 0000000000000000000000000000000000000000 $(git rev-parse --verify master:file2) A copy-of-file2 + :000000 100755 $ZERO_OID $(git rev-parse --verify master:file2) A copy-of-file2 EOF git diff-tree -M -r master verify--import-marks >actual && compare_diff_raw expect actual && @@ -364,7 +364,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 @@ -619,8 +619,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 @@ -2732,7 +2732,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 @@ -3083,7 +3083,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 '