From patchwork Fri Jun 19 17:55:53 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: 11614861 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 8FE8F13A0 for ; Fri, 19 Jun 2020 17:57:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6807621527 for ; Fri, 19 Jun 2020 17:57:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="sRT5PH0G" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393787AbgFSR5c (ORCPT ); Fri, 19 Jun 2020 13:57:32 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:39554 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404568AbgFSR4l (ORCPT ); Fri, 19 Jun 2020 13:56:41 -0400 Received: from camp.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:7d4e:cde:7c41:71c2]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id 9072B60A70; Fri, 19 Jun 2020 17:56:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1592589391; 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=sRT5PH0GRSvX9ZtP2neSToPeVAOl5rv3xTrhLPAoHOI56HjWgujEZ+F49xnazoDOR l7GUrLPVd491RrVwe4R0aYCis2Vl0CCqomcpG2V5zEi82ftz4ea3VQiw5e+7rHiWgX 3YNaNgdMCWBjhHdOkpSyv1TyZjfhIsXy8I/jGFx3t2E2rv46INOSp6VjhVig/GmgD5 aqkx0Sazsa1BjNO4qBN7QM6/biLSUnP5qi9jqxa4o5igxfh0cBy0eeQISRYkkQU3Oh j9cF1QyKVVvm54TO6NBXL//SVlxndMOdI1FBHbPnIPLcqL2yjZRCuG0r5qLhUTBe5L uMc0g7ygMfeu3L2q5OgZ1EGRRCSoGlzmplenIwrJ2kayoj7BPjAqCxfHWiRJ0oFj3o Q0rmQtEcjLBZoh1c9u1eDOkwKFgaYrByehARMIuMyUcGg0fyJBR6WhTspx5ovj84ud 05rjgnzvyfQo+D0Si1KGRYFzFCbvW2rFvzM+EH8srDOwXIyphJ0 From: "brian m. carlson" To: Cc: Junio C Hamano , =?utf-8?q?Martin_=C3=85gren?= Subject: [PATCH v3 36/44] t1050: pass algorithm to index-pack when outside repo Date: Fri, 19 Jun 2020 17:55:53 +0000 Message-Id: <20200619175601.569856-37-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.27.0.278.ge193c7cf3a9 In-Reply-To: <20200619175601.569856-1-sandals@crustytoothpaste.net> References: <20200513005424.81369-1-sandals@crustytoothpaste.net> <20200619175601.569856-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' '