From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: <git@vger.kernel.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH 32/38] Enable SHA-256 support by default
Date: Fri, 10 Jul 2020 02:47:22 +0000 [thread overview]
Message-ID: <20200710024728.3100527-33-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20200710024728.3100527-1-sandals@crustytoothpaste.net>
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 <sandals@crustytoothpaste.net>
---
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 &&
next prev parent reply other threads:[~2020-07-10 2:49 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-10 2:46 [PATCH 00/38] SHA-256, part 3/3 brian m. carlson
2020-07-10 2:46 ` [PATCH 01/38] t: make test-bloom initialize repository brian m. carlson
2020-07-10 2:46 ` [PATCH 02/38] t1001: use $ZERO_OID brian m. carlson
2020-07-10 2:46 ` [PATCH 03/38] t3305: make hash agnostic brian m. carlson
2020-07-10 2:46 ` [PATCH 04/38] t3404: prepare 'short SHA-1 collision' tests for SHA-256 brian m. carlson
2020-07-10 2:46 ` [PATCH 05/38] t6100: make hash size independent brian m. carlson
2020-07-10 2:46 ` [PATCH 06/38] t6101: " brian m. carlson
2020-07-10 2:46 ` [PATCH 07/38] t6301: " brian m. carlson
2020-07-10 2:46 ` [PATCH 08/38] t6500: specify test values for SHA-256 brian m. carlson
2020-07-10 2:46 ` [PATCH 09/38] t6501: avoid hard-coded objects brian m. carlson
2020-07-10 2:47 ` [PATCH 10/38] t7003: compute appropriate length constant brian m. carlson
2020-07-10 2:47 ` [PATCH 11/38] t7063: make hash size independent brian m. carlson
2020-07-11 0:43 ` Junio C Hamano
2020-07-11 0:54 ` brian m. carlson
2020-07-10 2:47 ` [PATCH 12/38] t7201: abstract away SHA-1-specific constants brian m. carlson
2020-07-10 2:47 ` [PATCH 13/38] t7102: " brian m. carlson
2020-07-10 2:47 ` [PATCH 14/38] t7400: make hash size independent brian m. carlson
2020-07-10 2:47 ` [PATCH 15/38] t7405: " brian m. carlson
2020-07-10 2:47 ` [PATCH 16/38] t7506: avoid checking for SHA-1-specific constants brian m. carlson
2020-07-10 2:47 ` [PATCH 17/38] t7508: use $ZERO_OID instead of hard-coded constant brian m. carlson
2020-07-10 2:47 ` [PATCH 18/38] t8002: make hash size independent brian m. carlson
2020-07-10 2:47 ` [PATCH 19/38] t8003: " brian m. carlson
2020-07-10 2:47 ` [PATCH 20/38] t8011: " brian m. carlson
2020-07-10 2:47 ` [PATCH 21/38] t9300: abstract away SHA-1-specific constants brian m. carlson
2020-07-10 2:47 ` [PATCH 22/38] t9300: use $ZERO_OID instead of hard-coded object ID brian m. carlson
2020-07-10 2:47 ` [PATCH 23/38] t9301: make hash size independent brian m. carlson
2020-07-10 2:47 ` [PATCH 24/38] t9350: " brian m. carlson
2020-07-10 2:47 ` [PATCH 25/38] t9500: ensure that algorithm info is preserved in config brian m. carlson
2020-07-10 2:47 ` [PATCH 26/38] t9700: make hash size independent brian m. carlson
2020-07-10 2:47 ` [PATCH 27/38] t5308: make test work with SHA-256 brian m. carlson
2020-07-10 2:47 ` [PATCH 28/38] t0410: mark test with SHA1 prerequisite brian m. carlson
2020-07-10 2:47 ` [PATCH 29/38] http-fetch: set up git directory before parsing pack hashes brian m. carlson
2020-07-10 2:47 ` [PATCH 30/38] builtin/verify-pack: implement an --object-format option brian m. carlson
2020-07-10 2:47 ` [PATCH 31/38] setup: add support for reading extensions.objectformat brian m. carlson
2020-07-10 2:47 ` brian m. carlson [this message]
2020-07-10 2:47 ` [PATCH 33/38] t: add test_oid option to select hash algorithm brian m. carlson
2020-07-10 2:47 ` [PATCH 34/38] t: allow testing different hash algorithms via environment brian m. carlson
2020-07-10 2:47 ` [PATCH 35/38] t: make SHA1 prerequisite depend on default hash brian m. carlson
2020-07-12 2:13 ` Denton Liu
2020-07-12 17:34 ` Junio C Hamano
2020-07-10 2:47 ` [PATCH 36/38] ci: run tests with SHA-256 brian m. carlson
2020-07-10 15:09 ` Derrick Stolee
2020-07-10 2:47 ` [PATCH 37/38] docs: add documentation for extensions.objectFormat brian m. carlson
2020-07-10 20:21 ` Martin Ågren
2020-07-10 2:47 ` [PATCH 38/38] t: remove test_oid_init in tests brian m. carlson
2020-07-10 15:14 ` [PATCH 00/38] SHA-256, part 3/3 Derrick Stolee
2020-07-10 19:55 ` brian m. carlson
2020-07-10 20:15 ` Junio C Hamano
2020-07-11 0:37 ` Junio C Hamano
2020-07-11 1:06 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200710024728.3100527-33-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).