clone: propagate object-format when cloning from void
A user could prepare an empty repository and set it to use SHA256 as the object format. The new repository created by "git clone" from such a repository however would not record that it is expecting objects in the same SHA256 format. This works as expected if the source repository is not empty. Just like we started copying the name of the primary branch from the remote repository even if it is unborn in 3d8314f8 (clone: propagate empty remote HEAD even with other branches, 2022-07-07), lift the code that records the object format out of the block executed only when cloning from an instantiated repository, so that it works also when cloning from an empty repository. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 5, 2023 at 14:15 UTC
8b214c2e9dda8fc5b8d49b978fd2c155b7596cd0
2 files changed
+17
-5
builtin/clone.c
+6
-5
@@ -910,6 +910,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
910
int err = 0, complete_refs_before_fetch = 1;
911
int submodule_progress;
912
int filter_submodules = 0;
913
+ int hash_algo;
914
915
struct transport_ls_refs_options transport_ls_refs_options =
916
TRANSPORT_LS_REFS_OPTIONS_INIT;
@@ -1298,15 +1299,15 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
1299
}
1300
}
1301
1301
- if (mapped_refs) {
1302
- int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport));
1303
-
1302
/*
1303
* Now that we know what algorithm the remote side is using,
1304
* let's set ours to the same thing.
1305
*/
1308
- initialize_repository_version(hash_algo, 1);
1309
- repo_set_hash_algo(the_repository, hash_algo);
1306
+ hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport));
1307
+ initialize_repository_version(hash_algo, 1);
1308
+ repo_set_hash_algo(the_repository, hash_algo);
1309
+
1310
+ if (mapped_refs) {
1311
/*
1312
* transport_get_remote_refs() may return refs with null sha-1
1313
* in mapped_refs (see struct transport->get_refs_list
t/t5702-protocol-v2.sh
+11
@@ -269,6 +269,17 @@ test_expect_success 'clone propagates unborn HEAD from non-empty repo' '
269
grep "warning: remote HEAD refers to nonexistent ref" stderr
270
'
271
272
+test_expect_success 'clone propagates object-format from empty repo' '
273
+ test_when_finished "rm -fr src256 dst256" &&
274
+
275
+ echo sha256 >expect &&
276
+ git init --object-format=sha256 src256 &&
277
+ git clone src256 dst256 &&
278
+ git -C dst256 rev-parse --show-object-format >actual &&
279
+
280
+ test_cmp expect actual
281
+'
282
+
283
test_expect_success 'bare clone propagates unborn HEAD from non-empty repo' '
284
test_when_finished "rm -rf file_unborn_parent file_unborn_child.git" &&
285