From patchwork Fri Jul 10 02:47: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: 11655517 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 EA822739 for ; Fri, 10 Jul 2020 02:49:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE32D20663 for ; Fri, 10 Jul 2020 02:49:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=crustytoothpaste.net header.i=@crustytoothpaste.net header.b="aoi+v8Di" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727840AbgGJCs7 (ORCPT ); Thu, 9 Jul 2020 22:48:59 -0400 Received: from injection.crustytoothpaste.net ([192.241.140.119]:40472 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727090AbgGJCsp (ORCPT ); Thu, 9 Jul 2020 22:48:45 -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 7BFEB60A74; Fri, 10 Jul 2020 02:48:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1594349317; bh=GA9vs9IiyAAK95Fl2gec3JKiN39VQ/hmb0NCb5N6xQI=; 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=aoi+v8DiYkKvhYLwT4KpGoLNpJarOITBv2e+NcYNNyWdopJvTXAGtNPHqix4XolZH N5yJHNmUEzS6MW6n5J8XCFcwf4G5vNhomMIblQIOIUefjXZrP8f/pbDsSqQl30BnJ+ 4td0NVEovgc4IXHDaP2czi3vjSQ/x+sY/e+NHK5G2f9C2+Iur1qqGFysMUM+oe6O4X SHz79kcHn3JZN2JebQrIfdPLUiUN6mC0EEEe96dNmgEw24t/k4Ke+m4JEL+Jwc6LIK kzasRNv/fgEwxluluaNK6I6UxHIQ2bCzd1tuWIhCunj5iI1Lq9c1ZRzfLM8EpHbJYQ HkS44xO9X0HawuMLRUxhdiA/EMAgtpamV49rX3KohaVpKk8w+dj7gDW7LjRLmGgV7S ffol70CQpAzFnnDyQaOPVlt8jMWRmhiXipcxzvpXqd3kGhj57ANDuMG6N3nivzalWB Wk0WQLkO08x6duTiuQbcvOMd/BoaUpczXY2v4BDCT3uMlVxo69j From: "brian m. carlson" To: Cc: Johannes Schindelin Subject: [PATCH 32/38] Enable SHA-256 support by default Date: Fri, 10 Jul 2020 02:47:22 +0000 Message-Id: <20200710024728.3100527-33-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.27.0.353.gb9a2d1a020 In-Reply-To: <20200710024728.3100527-1-sandals@crustytoothpaste.net> References: <20200710024728.3100527-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 Now that the we have a complete SHA-256 implementation in Git, let's enable it so people can use it. Remove the ENABLE_SHA256 define constant everywhere it's used. Add tests for initializing a repository with SHA-256. Signed-off-by: brian m. carlson --- builtin/init-db.c | 5 ----- config.mak.dev | 2 -- repository.c | 4 ---- t/t0001-init.sh | 31 +++++++++++++++++++++++++++++++ 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/builtin/init-db.c b/builtin/init-db.c index cee64823cb..f70076d38e 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -183,11 +183,6 @@ void initialize_repository_version(int hash_algo) char repo_version_string[10]; int repo_version = GIT_REPO_VERSION; -#ifndef ENABLE_SHA256 - if (hash_algo != GIT_HASH_SHA1) - die(_("The hash algorithm %s is not supported in this build."), hash_algos[hash_algo].name); -#endif - if (hash_algo != GIT_HASH_SHA1) repo_version = GIT_REPO_VERSION_READ; diff --git a/config.mak.dev b/config.mak.dev index cd4a82a9eb..89b218d11a 100644 --- a/config.mak.dev +++ b/config.mak.dev @@ -16,8 +16,6 @@ DEVELOPER_CFLAGS += -Wstrict-prototypes DEVELOPER_CFLAGS += -Wunused DEVELOPER_CFLAGS += -Wvla -DEVELOPER_CFLAGS += -DENABLE_SHA256 - ifndef COMPILER_FEATURES COMPILER_FEATURES := $(shell ./detect-compiler $(CC)) endif diff --git a/repository.c b/repository.c index 6f7f6f002b..a4174ddb06 100644 --- a/repository.c +++ b/repository.c @@ -89,10 +89,6 @@ void repo_set_gitdir(struct repository *repo, void repo_set_hash_algo(struct repository *repo, int hash_algo) { repo->hash_algo = &hash_algos[hash_algo]; -#ifndef ENABLE_SHA256 - if (hash_algo != GIT_HASH_SHA1) - die(_("The hash algorithm %s is not supported in this build."), repo->hash_algo->name); -#endif } /* diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 6d2467995e..34d2064660 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -441,6 +441,37 @@ test_expect_success 're-init from a linked worktree' ' ) ' +test_expect_success 'init honors GIT_DEFAULT_HASH' ' + GIT_DEFAULT_HASH=sha1 git init sha1 && + git -C sha1 rev-parse --show-object-format >actual && + echo sha1 >expected && + test_cmp expected actual && + GIT_DEFAULT_HASH=sha256 git init sha256 && + git -C sha256 rev-parse --show-object-format >actual && + echo sha256 >expected && + test_cmp expected actual +' + +test_expect_success 'init honors --object-format' ' + git init --object-format=sha256 explicit && + git -C explicit rev-parse --show-object-format >actual && + echo sha256 >expected && + test_cmp expected actual +' + +test_expect_success 'extensions.objectFormat is not honored with repo version 0' ' + git init --object-format=sha256 explicit-v0 && + test_config -C explicit-v0 core.repositoryformatversion 0 && + git -C explicit-v0 rev-parse --show-object-format >actual && + echo sha1 >expected && + test_cmp expected actual +' + +test_expect_success 'init rejects attempts to initialize with different hash' ' + test_must_fail git -C sha1 init --object-format=sha256 && + test_must_fail git -C sha256 init --object-format=sha1 +' + test_expect_success MINGW 'core.hidedotfiles = false' ' git config --global core.hidedotfiles false && rm -rf newdir &&