Skip to content

Commit de28459

Browse files
gitstergitster
committed
Merge branch 'jk/clone-unborn-confusion' into maint
"git clone" from a repository with some ref whose HEAD is unborn did not set the HEAD in the resulting repository correctly, which has been corrected. source: <YsdyLS4UFzj0j/[email protected]> * jk/clone-unborn-confusion: clone: move unborn head creation to update_head() clone: use remote branch if it matches default HEAD clone: propagate empty remote HEAD even with other branches clone: drop extra newline from warning message
2 parents 00d1260 + daf7898 commit de28459

File tree

3 files changed

+117
-39
lines changed

3 files changed

+117
-39
lines changed

‎builtin/clone.c

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ static void update_remote_refs(const struct ref *refs,
606606
}
607607

608608
static void update_head(const struct ref *our, const struct ref *remote,
609-
const char *msg)
609+
const char *unborn, const char *msg)
610610
{
611611
const char *head;
612612
if (our && skip_prefix(our->name, "refs/heads/", &head)) {
@@ -632,6 +632,15 @@ static void update_head(const struct ref *our, const struct ref *remote,
632632
*/
633633
update_ref(msg, "HEAD", &remote->old_oid, NULL, REF_NO_DEREF,
634634
UPDATE_REFS_DIE_ON_ERR);
635+
} else if (unborn && skip_prefix(unborn, "refs/heads/", &head)) {
636+
/*
637+
* Unborn head from remote; same as "our" case above except
638+
* that we have no ref to update.
639+
*/
640+
if (create_symref("HEAD", unborn, NULL) < 0)
641+
die(_("unable to update HEAD"));
642+
if (!option_bare)
643+
install_branch_config(0, head, remote_name, unborn);
635644
}
636645
}
637646

@@ -672,7 +681,7 @@ static int checkout(int submodule_progress, int filter_submodules)
672681
head = resolve_refdup("HEAD", RESOLVE_REF_READING, &oid, NULL);
673682
if (!head) {
674683
warning(_("remote HEAD refers to nonexistent ref, "
675-
"unable to checkout.\n"));
684+
"unable to checkout"));
676685
return 0;
677686
}
678687
if (!strcmp(head, "HEAD")) {
@@ -876,6 +885,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
876885
const struct ref *refs, *remote_head;
877886
struct ref *remote_head_points_at = NULL;
878887
const struct ref *our_head_points_at;
888+
char *unborn_head = NULL;
879889
struct ref *mapped_refs = NULL;
880890
const struct ref *ref;
881891
struct strbuf key = STRBUF_INIT;
@@ -1266,51 +1276,49 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
12661276
if (transport_fetch_refs(transport, mapped_refs))
12671277
die(_("remote transport reported error"));
12681278
}
1269-
1270-
remote_head = find_ref_by_name(refs, "HEAD");
1271-
remote_head_points_at =
1272-
guess_remote_head(remote_head, mapped_refs, 0);
1273-
1274-
if (option_branch) {
1275-
our_head_points_at =
1276-
find_remote_branch(mapped_refs, option_branch);
1277-
1278-
if (!our_head_points_at)
1279-
die(_("Remote branch %s not found in upstream %s"),
1280-
option_branch, remote_name);
1281-
}
1282-
else
1283-
our_head_points_at = remote_head_points_at;
12841279
}
1285-
else {
1286-
const char *branch;
1287-
const char *ref;
1288-
char *ref_free = NULL;
12891280

1290-
if (option_branch)
1291-
die(_("Remote branch %s not found in upstream %s"),
1292-
option_branch, remote_name);
1281+
remote_head = find_ref_by_name(refs, "HEAD");
1282+
remote_head_points_at = guess_remote_head(remote_head, mapped_refs, 0);
12931283

1294-
warning(_("You appear to have cloned an empty repository."));
1284+
if (option_branch) {
1285+
our_head_points_at = find_remote_branch(mapped_refs, option_branch);
1286+
if (!our_head_points_at)
1287+
die(_("Remote branch %s not found in upstream %s"),
1288+
option_branch, remote_name);
1289+
} else if (remote_head_points_at) {
1290+
our_head_points_at = remote_head_points_at;
1291+
} else if (remote_head) {
12951292
our_head_points_at = NULL;
1296-
remote_head_points_at = NULL;
1297-
remote_head = NULL;
1298-
option_no_checkout = 1;
1293+
} else {
1294+
const char *branch;
1295+
1296+
if (!mapped_refs) {
1297+
warning(_("You appear to have cloned an empty repository."));
1298+
option_no_checkout = 1;
1299+
}
12991300

13001301
if (transport_ls_refs_options.unborn_head_target &&
13011302
skip_prefix(transport_ls_refs_options.unborn_head_target,
13021303
"refs/heads/", &branch)) {
1303-
ref = transport_ls_refs_options.unborn_head_target;
1304-
create_symref("HEAD", ref, reflog_msg.buf);
1304+
unborn_head = xstrdup(transport_ls_refs_options.unborn_head_target);
13051305
} else {
13061306
branch = git_default_branch_name(0);
1307-
ref_free = xstrfmt("refs/heads/%s", branch);
1308-
ref = ref_free;
1307+
unborn_head = xstrfmt("refs/heads/%s", branch);
13091308
}
13101309

1311-
if (!option_bare)
1312-
install_branch_config(0, branch, remote_name, ref);
1313-
free(ref_free);
1310+
/*
1311+
* We may have selected a local default branch name "foo",
1312+
* and even though the remote's HEAD does not point there,
1313+
* it may still have a "foo" branch. If so, set it up so
1314+
* that we can follow the usual checkout code later.
1315+
*
1316+
* Note that for an empty repo we'll already have set
1317+
* option_no_checkout above, which would work against us here.
1318+
* But for an empty repo, find_remote_branch() can never find
1319+
* a match.
1320+
*/
1321+
our_head_points_at = find_remote_branch(mapped_refs, branch);
13141322
}
13151323

13161324
write_refspec_config(src_ref_prefix, our_head_points_at,
@@ -1330,7 +1338,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
13301338
branch_top.buf, reflog_msg.buf, transport,
13311339
!is_local);
13321340

1333-
update_head(our_head_points_at, remote_head, reflog_msg.buf);
1341+
update_head(our_head_points_at, remote_head, unborn_head, reflog_msg.buf);
13341342

13351343
/*
13361344
* We want to show progress for recursive submodule clones iff
@@ -1357,6 +1365,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
13571365
strbuf_release(&key);
13581366
free_refs(mapped_refs);
13591367
free_refs(remote_head_points_at);
1368+
free(unborn_head);
13601369
free(dir);
13611370
free(path);
13621371
UNLEAK(repo);

‎t/t5605-clone-local.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ test_expect_success 'preparing origin repository' '
2121
git bundle create b2.bundle main &&
2222
mkdir dir &&
2323
cp b1.bundle dir/b3 &&
24-
cp b1.bundle b4
24+
cp b1.bundle b4 &&
25+
git branch not-main main &&
26+
git bundle create b5.bundle not-main
2527
'
2628

2729
test_expect_success 'local clone without .git suffix' '
@@ -83,11 +85,19 @@ test_expect_success 'bundle clone from b4.bundle that does not exist' '
8385
test_must_fail git clone b4.bundle bb
8486
'
8587

86-
test_expect_success 'bundle clone with nonexistent HEAD' '
88+
test_expect_success 'bundle clone with nonexistent HEAD (match default)' '
8789
git clone b2.bundle b2 &&
8890
(cd b2 &&
8991
git fetch &&
90-
test_must_fail git rev-parse --verify refs/heads/main)
92+
git rev-parse --verify refs/heads/main)
93+
'
94+
95+
test_expect_success 'bundle clone with nonexistent HEAD (no match default)' '
96+
git clone b5.bundle b5 &&
97+
(cd b5 &&
98+
git fetch &&
99+
test_must_fail git rev-parse --verify refs/heads/main &&
100+
test_must_fail git rev-parse --verify refs/heads/not-main)
91101
'
92102

93103
test_expect_success 'clone empty repository' '

‎t/t5702-protocol-v2.sh

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,65 @@ test_expect_success 'bare clone propagates empty default branch' '
250250
grep "refs/heads/mydefaultbranch" file_empty_child.git/HEAD
251251
'
252252

253+
test_expect_success 'clone propagates unborn HEAD from non-empty repo' '
254+
test_when_finished "rm -rf file_unborn_parent file_unborn_child" &&
255+
256+
git init file_unborn_parent &&
257+
(
258+
cd file_unborn_parent &&
259+
git checkout -b branchwithstuff &&
260+
test_commit --no-tag stuff &&
261+
git symbolic-ref HEAD refs/heads/mydefaultbranch
262+
) &&
263+
264+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
265+
git -c init.defaultBranch=main -c protocol.version=2 \
266+
clone "file://$(pwd)/file_unborn_parent" \
267+
file_unborn_child 2>stderr &&
268+
grep "refs/heads/mydefaultbranch" file_unborn_child/.git/HEAD &&
269+
grep "warning: remote HEAD refers to nonexistent ref" stderr
270+
'
271+
272+
test_expect_success 'bare clone propagates unborn HEAD from non-empty repo' '
273+
test_when_finished "rm -rf file_unborn_parent file_unborn_child.git" &&
274+
275+
git init file_unborn_parent &&
276+
(
277+
cd file_unborn_parent &&
278+
git checkout -b branchwithstuff &&
279+
test_commit --no-tag stuff &&
280+
git symbolic-ref HEAD refs/heads/mydefaultbranch
281+
) &&
282+
283+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
284+
git -c init.defaultBranch=main -c protocol.version=2 \
285+
clone --bare "file://$(pwd)/file_unborn_parent" \
286+
file_unborn_child.git 2>stderr &&
287+
grep "refs/heads/mydefaultbranch" file_unborn_child.git/HEAD &&
288+
! grep "warning:" stderr
289+
'
290+
291+
test_expect_success 'defaulted HEAD uses remote branch if available' '
292+
test_when_finished "rm -rf file_unborn_parent file_unborn_child" &&
293+
294+
git init file_unborn_parent &&
295+
(
296+
cd file_unborn_parent &&
297+
git config lsrefs.unborn ignore &&
298+
git checkout -b branchwithstuff &&
299+
test_commit --no-tag stuff &&
300+
git symbolic-ref HEAD refs/heads/mydefaultbranch
301+
) &&
302+
303+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
304+
git -c init.defaultBranch=branchwithstuff -c protocol.version=2 \
305+
clone "file://$(pwd)/file_unborn_parent" \
306+
file_unborn_child 2>stderr &&
307+
grep "refs/heads/branchwithstuff" file_unborn_child/.git/HEAD &&
308+
test_path_is_file file_unborn_child/stuff.t &&
309+
! grep "warning:" stderr
310+
'
311+
253312
test_expect_success 'fetch with file:// using protocol v2' '
254313
test_when_finished "rm -f log" &&
255314

0 commit comments

Comments
 (0)