From patchwork Tue Jul 28 23:34:17 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: 11690063 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 4C68A6C1 for ; Tue, 28 Jul 2020 23:35:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2BA1E20829 for ; Tue, 28 Jul 2020 23:35:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="iVMxNTww" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730131AbgG1XfC (ORCPT ); Tue, 28 Jul 2020 19:35:02 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:40852 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730079AbgG1XfA (ORCPT ); Tue, 28 Jul 2020 19:35:00 -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 7E25F61011; Tue, 28 Jul 2020 23:34:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1595979299; bh=vM3TI4/RbUP1dFvpkiIgLxj2UZc7pmERZjdUoWlLhOs=; 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=iVMxNTwwhwKdwK697czADHaUJWstlU4hd4qR+SX1qTRWqmR3q0Nsx5a8mo/fbxsfu A1toy95dtzwTnwtWojLLXPFg68oQTe5yPOXa3lev4FdvdPStE2O7nSGnSriywMkLTY cuXtAIBReMohz9rTMyoW8sE1RWyaxCaMSxM/k/Cg0413Q3yEXTqYCXu0kR7Q0+ggU0 24HGRnAsIMrQtC0SgR6iVPMcPROG9KLxYatVM17kUT8z2gOtNi4wTrGIS4leL0NBFT BSbrzJtgouFkh4bdkfkPhNzbl3SUYbrc8ZPetc7NprzTBqNbspfH8thjOBkUS4ta/G HPC9ycfp+wvUlJrDCC7JJINI8woB/g/B9JbK5+nbmOuZ2QIoqXXtC8eJnX044s1fs6 h4CBFKDeeZo6aEIcP1dAH3NUJi1S8cQ9TziWmzwZW8learTUyZZjV/NZ1VYrcWqLuz tGeVTuHvwCknyn9QqysYH9OvxIg1lEkfHa3e7do5sbrjeizHVVz From: "brian m. carlson" To: Cc: Eric Sunshine Subject: [PATCH v5 10/39] t7003: compute appropriate length constant Date: Tue, 28 Jul 2020 23:34:17 +0000 Message-Id: <20200728233446.3066485-11-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.28.0.163.g6104cc2f0b6 In-Reply-To: <20200728233446.3066485-1-sandals@crustytoothpaste.net> References: <20200728233446.3066485-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 Instead of using a specific invalid hard-coded object ID, look one up from the translation table. Signed-off-by: brian m. carlson --- t/t7003-filter-branch.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index e23de7d0b5..beeb2b855a 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -5,6 +5,7 @@ test_description='git filter-branch' . "$TEST_DIRECTORY/lib-gpg.sh" test_expect_success 'setup' ' + test_oid_init && test_commit A && GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" && test_commit --notick B && @@ -463,10 +464,11 @@ test_expect_success 'rewrite submodule with another content' ' ' test_expect_success 'replace submodule revision' ' + invalid=$(test_oid numeric) && git reset --hard original && git filter-branch -f --tree-filter \ "if git ls-files --error-unmatch -- submod > /dev/null 2>&1 - then git update-index --cacheinfo 160000 0123456789012345678901234567890123456789 submod + then git update-index --cacheinfo 160000 $invalid submod fi" HEAD && test $orig_head != $(git show-ref --hash --head HEAD) '