From patchwork Mon May 25 19:59:22 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: 11569369 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 60D78912 for ; Mon, 25 May 2020 20:00:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 45D322075F for ; Mon, 25 May 2020 20:00:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="sNdF6jlq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390519AbgEYUAO (ORCPT ); Mon, 25 May 2020 16:00:14 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:38722 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390451AbgEYT77 (ORCPT ); Mon, 25 May 2020 15:59: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 5245260D18; Mon, 25 May 2020 19:59:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1590436798; bh=QhWwx5JrFjkmi9fYf3BLeqi+AU9uqTKM8zuKL+dV4ZA=; 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=sNdF6jlq2fH/+QuMoXHCxYKP4LbD/L9bd8DKG2xQOkJwMnM2DCDg7lDpq++JDxr1j KrE3uHfo3nxcJoijZhovKEHSYbq/l0JikTqVqcnoY6+gryQpjry8FWbswkK6qX14mA gyIvf4wigkpKQjTJDApU3DCyIHn3OlGcEXFGpYjWnt7Arc+b1cRDhcs92kOjohQ/4X +wUDgXivOwdwREqooyHVNjc1VIeSVNsbJOyVzxH3+qFogQhDpmEJ2I8hKsDbMT8mZM 8XPZ6Vp2yonxXB5SW4X4k8EuI4AWo2XTneIO9LzTrx/P9Ly4yHthnDcUA6cpDji1NB 1Al+Nmnlbe3BPgwdnISePOq9fXoec4vKpRwgwyL9t8xJXadqCvtZxtYzMnX4SMpCpO Y1yZOu27ZL9ta4s0L+7DlbN0bpmXYNkQ1K0Co2x8XEtE/WaSnOXfy8G9ByGSGpRXrK QKE4efkXuzgfkjN+mLVYosi2Yy/vsY65j7LvAAZJGU/5h/I8NXu From: "brian m. carlson" To: Cc: =?utf-8?q?Martin_=C3=85gren?= Subject: [PATCH v2 36/44] t1050: pass algorithm to index-pack when outside repo Date: Mon, 25 May 2020 19:59:22 +0000 Message-Id: <20200525195930.309665-37-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.27.0.rc0.183.gde8f92d652 In-Reply-To: <20200525195930.309665-1-sandals@crustytoothpaste.net> References: <20200513005424.81369-1-sandals@crustytoothpaste.net> <20200525195930.309665-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 When outside a repository, git index-pack is unable to guess the hash algorithm in use for a pack, since packs don't contain any information on the algorithm in use. Pass an option to index-pack to help it out in this test. Signed-off-by: brian m. carlson --- t/t1050-large.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/t1050-large.sh b/t/t1050-large.sh index 7f88ea07c2..6a56d1ca24 100755 --- a/t/t1050-large.sh +++ b/t/t1050-large.sh @@ -12,6 +12,7 @@ file_size () { } test_expect_success setup ' + test_oid_init && # clone does not allow us to pass core.bigfilethreshold to # new repos, so set core.bigfilethreshold globally git config --global core.bigfilethreshold 200k && @@ -177,7 +178,8 @@ test_expect_success 'git-show a large file' ' test_expect_success 'index-pack' ' git clone file://"$(pwd)"/.git foo && - GIT_DIR=non-existent git index-pack --strict --verify foo/.git/objects/pack/*.pack + GIT_DIR=non-existent git index-pack --object-format=$(test_oid algo) \ + --strict --verify foo/.git/objects/pack/*.pack ' test_expect_success 'repack' '