From: Stefan Beller <stefanbeller@googlemail.com>
To: Duy Nguyen <pclouds@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Ralf Thielow <ralf.thielow@gmail.com>,
robert.mitwicki@opensoftware.pl,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] clone: do not segfault when specifying a nonexistent branch
Date: Sun, 06 Oct 2013 11:27:20 +0200 [thread overview]
Message-ID: <52512CF8.2070205@googlemail.com> (raw)
In-Reply-To: <CACsJy8BX_fWdsCGa4jnh4CbkSMxp7btOFjwzB9K0eRtjUR_F-Q@mail.gmail.com>
On 10/05/2013 01:55 AM, Duy Nguyen wrote:
> On Fri, Oct 4, 2013 at 9:20 PM, Stefan Beller
> <stefanbeller@googlemail.com> wrote:
>> I think we should emit a warning additionally?
>>
>> Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
>
> I think it's nice to credit Robert for reporting the fault in the
> commit message (something like "reported-by:" or "noticed-by:"...)
I'll do so in a resend.
>
>> ---
>> builtin/clone.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/builtin/clone.c b/builtin/clone.c
>> index 0aff974..b764ad0 100644
>> --- a/builtin/clone.c
>> +++ b/builtin/clone.c
>> @@ -688,7 +688,7 @@ static void write_refspec_config(const char* src_ref_prefix,
>>
>> if (option_mirror || !option_bare) {
>> if (option_single_branch && !option_mirror) {
>> - if (option_branch) {
>> + if (option_branch && our_head_points_at) {
>> if (strstr(our_head_points_at->name, "refs/tags/"))
>> strbuf_addf(&value, "+%s:%s", our_head_points_at->name,
>> our_head_points_at->name);
>
> This prevents the segfault, but what about remote.*.fetch? Should we
> setup standard refspec for fetch or..?
>
Looking at the code a few lines below, this comment comes up:
/*
* otherwise, the next "git fetch" will
* simply fetch from HEAD without updating
* any remote-tracking branch, which is what
* we want.
*/
This behavior was good for the case (!option_branch && !remote_head_points_at)
Now we extend that behavior doing nothing to
((!option_branch || !our_head_points_at) && !remote_head_points_at)
I am not sure how to handle that case best. The user has given a non existing branch,
so it doesn't make sense to track that branch, but only have that
registered as a remote*.fetch?
Reading the documentation enhancements of 31b808a
(2012-09-20, clone --single: limit the fetch refspec to fetched branch), doesn't
talk about this corner case. So maybe the remote.*.fetch shall be set, but no branch
should be checked out, when running
git clone --depth 1 -b test https://github.com/mitfik/coredump.git /tmp/coredump.git
Does that make sense?
Stefan
next prev parent reply other threads:[~2013-10-06 9:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-04 13:54 Bug: Segmentation fault (core dumped) Robert Mitwicki
2013-10-04 14:20 ` [PATCH] clone: do not segfault when specifying a nonexistent branch Stefan Beller
2013-10-04 23:55 ` Duy Nguyen
2013-10-06 9:27 ` Stefan Beller [this message]
2013-10-07 10:46 ` Duy Nguyen
2013-10-08 10:06 ` Stefan Beller
2013-10-09 16:38 ` Ralf Thielow
2013-10-11 16:49 ` [PATCH] clone --branch: refuse to clone if upstream repo is empty Ralf Thielow
2013-10-14 19:08 ` Duy Nguyen
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=52512CF8.2070205@googlemail.com \
--to=stefanbeller@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=ralf.thielow@gmail.com \
--cc=robert.mitwicki@opensoftware.pl \
/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).