mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setup: fix reinit of repos with incompatible GIT_DEFAULT_HASH

Browse Source 
The exact same issue as described in the preceding commit also exists
for GIT_DEFAULT_HASH. Thus, reinitializing a repository that e.g. uses
SHA1 with `GIT_DEFAULT_HASH=sha256 git init` will cause the object
format of that repository to change to SHA256. This is of course bogus
as any existing objects and refs will not be converted, thus causing
repository corruption:

    $ git init repo
    Initialized empty Git repository in /tmp/repo/.git/
    $ cd repo/
    $ git commit --allow-empty -m message
    [main (root-commit) 35a7344] message
    $ GIT_DEFAULT_HASH=sha256 git init
    Reinitialized existing Git repository in /tmp/repo/.git/
    $ git show
    fatal: your current branch appears to be broken

Fix the issue by ignoring the environment variable in case the repo has
already been initialized with an object hash.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-01-30 17:24:19 +01:00
committed by Junio C Hamano
parent 796fda3f78
commit 7e88640cd1
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup.c
View File

@ -2517,6 +2517,8 @@ static void repository_format_configure(struct repository_format *repo_fmt,
int env_algo = hash_algo_by_name(env); int env_algo = hash_algo_by_name(env);
if (env_algo == GIT_HASH_UNKNOWN) if (env_algo == GIT_HASH_UNKNOWN)
die(_("unknown hash algorithm '%s'"), env); die(_("unknown hash algorithm '%s'"), env);
if (repo_fmt->version < 0 ||
repo_fmt->hash_algo == GIT_HASH_UNKNOWN)
repo_fmt->hash_algo = env_algo; repo_fmt->hash_algo = env_algo;
} else if (cfg.hash != GIT_HASH_UNKNOWN) { } else if (cfg.hash != GIT_HASH_UNKNOWN) {
repo_fmt->hash_algo = cfg.hash; repo_fmt->hash_algo = cfg.hash;

12
t/t0001-init.sh
View File

@ -586,6 +586,18 @@ test_expect_success 'GIT_DEFAULT_HASH overrides init.defaultObjectFormat' '
echo sha256 >expected echo sha256 >expected
' '
for hash in sha1 sha256
do
test_expect_success "reinit repository with GIT_DEFAULT_HASH=$hash does not change format" '
test_when_finished "rm -rf repo" &&
git init repo &&
git -C repo rev-parse --show-object-format >expect &&
GIT_DEFAULT_HASH=$hash git init repo &&
git -C repo rev-parse --show-object-format >actual &&
test_cmp expect actual
'
done
test_expect_success 'extensions.objectFormat is not allowed with repo version 0' ' test_expect_success 'extensions.objectFormat is not allowed with repo version 0' '
test_when_finished "rm -rf explicit-v0" && test_when_finished "rm -rf explicit-v0" &&
git init --object-format=sha256 explicit-v0 && git init --object-format=sha256 explicit-v0 &&