From patchwork Wed Jul 29 23:14:04 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: 11691901 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 C09E913B6 for ; Wed, 29 Jul 2020 23:15:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A6A0120809 for ; Wed, 29 Jul 2020 23:15:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="KjjzlrXh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728195AbgG2XPa (ORCPT ); Wed, 29 Jul 2020 19:15:30 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:41166 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728009AbgG2XPY (ORCPT ); Wed, 29 Jul 2020 19:15:24 -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 9B23261011; Wed, 29 Jul 2020 23:14:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1596064492; bh=bkn6gRdFc3a7Wl1a2vTHql6/IoBndbcv3M9Ug3dmdYw=; 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=KjjzlrXhx5z+LGKzzqMl8IpL1706HOlq4D0E8eidD0u1YDVVMhEAJl9ZqZJawAakQ J8SasczzeGhpmAxmZjS974dF6e1jaee5MzQbx5xmKRWND8Qm9nDhEk+HapmNdj6r5F JsvqoWGTI/d2FJ7trmI11Ju/mZmPLL8099Adbyr4lY1DTNCW6QIWdGkpYCCJdKhG+3 dIgD1vLWX0pN+cUuOsu9nNJ5p53l+NTKNnCbjg5BiKvZcK6ALCctasYCtE8Nuop5B/ 9mQOxRCZxVXAZ+3QQYej3xg0O9tbhj0cruD+KLypUZf9PKTDvqJjzj4/jx89NURiih Wk89ZWl6n6DRVJhRVdfQR6gJuL5cgwlvv93IR08z/D1TgQyWnSxDHMKbf9U+DuhBRk Bt1vAbtz49DIC7wW0lm9h8yxabweymhs/cj+KTIVy02kFphqC7A5DxZ7LvhzsNKFAF kA6Ja004mcnFfo4RbrUnlZY6eO7X67DF9KpSLjA//30gH3UPqVf From: "brian m. carlson" To: Cc: Eric Sunshine Subject: [PATCH v6 15/39] t7405: make hash size independent Date: Wed, 29 Jul 2020 23:14:04 +0000 Message-Id: <20200729231428.3658647-16-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 Use $ZERO_OID instead of hard-coding a fixed size all-zeros object ID. Signed-off-by: brian m. carlson --- t/t7405-submodule-merge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index aa33978ed2..6a1e5f8232 100755 --- a/t/t7405-submodule-merge.sh +++ b/t/t7405-submodule-merge.sh @@ -195,7 +195,7 @@ test_expect_success 'git submodule status should display the merge conflict prop url = $TRASH_DIRECTORY/sub EOF cat >expect < actual && test_cmp expect actual && @@ -214,7 +214,7 @@ test_expect_success 'git submodule status should display the merge conflict prop url = $TRASH_DIRECTORY/sub EOF cat >expect < actual && test_cmp expect actual &&