From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Jonathan Tan <jonathantanmy@google.com>
Subject: Re: [PATCH 3/3] clone: propagate empty remote HEAD even with other branches
Date: Wed, 06 Jul 2022 15:01:54 -0700 [thread overview]
Message-ID: <xmqq5yk9hpd9.fsf@gitster.g> (raw)
In-Reply-To: <xmqqr12ygl3p.fsf@gitster.g> (Junio C. Hamano's message of "Wed, 06 Jul 2022 11:19:22 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Jeff King <peff@peff.net> writes:
> ...
>> For a bare clone, it won't emit any warning at all (but will still
>> set up HEAD appropriately). That's probably fine. There's no part of
>> the operation we were unable to perform, so any "by the way, the
>> remote HEAD wasn't there but we pointed our HEAD to it anyway"
>> message would be purely informational. Though perhaps one could argue
>> the same about the current "empty repository" message in a bare
>> clone.
>
> I am kind of surprised that the code still behaves differently
> between empty and non-empty cases. Given the earlier decision above
> to consistently use the remote's HEAD, I would have expected that
> setting HEAD to point at an non-existent ref would be done at one
> place, instead of being done for empty and non-empty clone
> separately. We'll find out why while reading the patch, I think.
OK, that is because we have if/else on the number of refs mapped via
the refspec by wanted_peer_refs(), and setup_unborn_head is done
independently in each of these if/else arms.
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -1298,9 +1298,12 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
> if (!our_head_points_at)
> die(_("Remote branch %s not found in upstream %s"),
> option_branch, remote_name);
> - }
> - else
> + } else {
> our_head_points_at = remote_head_points_at;
> + if (!our_head_points_at)
> + setup_unborn_head(transport_ls_refs_options.unborn_head_target,
> + reflog_msg.buf);
> + }
> }
> else {
> if (option_branch)
The following rewrite with the same behaviour may be a bit easier to
follow.
Thanks.
builtin/clone.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git c/builtin/clone.c w/builtin/clone.c
index cb7b347c5a..0b172af9e4 100644
--- c/builtin/clone.c
+++ w/builtin/clone.c
@@ -1298,11 +1298,12 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
if (!our_head_points_at)
die(_("Remote branch %s not found in upstream %s"),
option_branch, remote_name);
- } else {
+ } else if (remote_head_points_at) {
our_head_points_at = remote_head_points_at;
- if (!our_head_points_at)
- setup_unborn_head(transport_ls_refs_options.unborn_head_target,
- reflog_msg.buf);
+ } else {
+ our_head_points_at = NULL;
+ setup_unborn_head(transport_ls_refs_options.unborn_head_target,
+ reflog_msg.buf);
}
}
else {
next prev parent reply other threads:[~2022-07-06 22:04 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-06 7:57 [PATCH 0/3] cloning unborn HEAD when other branches are present Jeff King
2022-07-06 8:00 ` [PATCH 1/3] clone: drop extra newline from warning message Jeff King
2022-07-06 8:00 ` [PATCH 2/3] clone: factor out unborn head setup into its own function Jeff King
2022-07-06 8:03 ` [PATCH 3/3] clone: propagate empty remote HEAD even with other branches Jeff King
2022-07-06 18:19 ` Junio C Hamano
2022-07-06 22:01 ` Junio C Hamano [this message]
2022-07-07 17:40 ` Jeff King
2022-07-07 18:50 ` Junio C Hamano
2022-07-07 23:54 ` [PATCH v2 0/3] cloning unborn HEAD when other branches are present Jeff King
2022-07-07 23:54 ` [PATCH v2 1/3] clone: drop extra newline from warning message Jeff King
2022-07-07 23:57 ` [PATCH v2 2/3] clone: propagate empty remote HEAD even with other branches Jeff King
2022-07-08 15:41 ` Junio C Hamano
2022-07-08 16:08 ` Jeff King
2022-07-07 23:59 ` [PATCH v2 3/3] clone: use remote branch if it matches default HEAD Jeff King
2022-07-08 16:28 ` Junio C Hamano
2022-07-08 19:30 ` Jeff King
2022-07-08 20:33 ` Junio C Hamano
2022-07-11 9:21 ` [PATCH v2 4/3] clone: move unborn head creation to update_head() Jeff King
2022-07-11 20:36 ` Junio C Hamano
2022-07-07 17:23 ` [PATCH 3/3] clone: propagate empty remote HEAD even with other branches Jeff King
2022-07-06 18:17 ` [PATCH 0/3] cloning unborn HEAD when other branches are present Jonathan Tan
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=xmqq5yk9hpd9.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
/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).