From: Clemens Fruhwirth <clemens@endorphin.org>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"Jan Pokorný" <poki@fnusa.cz>,
"Corentin BOMPARD" <corentin.bompard@etu.univ-lyon1.fr>
Subject: Re: [PATCH v2] pull, fetch: fix segfault in --set-upstream option
Date: Tue, 24 Aug 2021 09:30:59 +0200 [thread overview]
Message-ID: <CAG6gW_s6FHG6muJ6Hai-Sb2ntmygLymQZr8YrN212_SV1VhBAw@mail.gmail.com> (raw)
In-Reply-To: <patch-v2-1.1-9e846b76959-20210823T125434Z-avarab@gmail.com>
On Mon, 23 Aug 2021 at 14:56, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
>
> A proposed replacement of cf/fetch-set-upstream-while-detached which
> as noted in What's Cooking has been languishing for a while. I changed
> the die() in my version to a warning() as suggested by Junio & updated
> the test and commit message accordingly.
Thank you Ævar, for taking care of that and adding tests and my
apologizes for not responding in a timely manner.
> builtin/fetch.c | 11 +++++++++++
> t/t5553-set-upstream.sh | 22 ++++++++++++++++++++++
> 2 files changed, 33 insertions(+)
>
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index 25740c13df1..ca487edd805 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -1623,6 +1623,17 @@ static int do_fetch(struct transport *transport,
> }
> }
> if (source_ref) {
> + if (!branch) {
> + const char *shortname = NULL;
> + if (!skip_prefix(source_ref->name,
> + "refs/heads/", &shortname))
> + shortname = source_ref->name;
Is skip_prefix ever able to fail?
- If yes, then shortname will be left pointing to NULL when we print
the warning below. Warning probably won't die because of NULL, but it
still will print something weird.
- If no, then an assert(!skip_prefix(source_ref->name, "refs/heads/",
&shortname)) might be more idiomatic.
> diff --git a/t/t5553-set-upstream.sh b/t/t5553-set-upstream.sh
> index b1d614ce18c..7d12ceff702 100755
> --- a/t/t5553-set-upstream.sh
> +++ b/t/t5553-set-upstream.sh
Thank for you adding tests. LGTM.
Regards,
--
Fruhwirth Clemens http://clemens.endorphin.org
next prev parent reply other threads:[~2021-08-24 7:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-05 15:46 git pull --set-upstream segfaults on branchless repo Clemens Fruhwirth
2021-07-19 10:04 ` Jan Pokorný
2021-07-19 14:30 ` [PATCH] pull, fetch: fix segfault in --set-upstream option Ævar Arnfjörð Bjarmason
2021-07-19 15:17 ` Junio C Hamano
2021-08-23 12:56 ` [PATCH v2] " Ævar Arnfjörð Bjarmason
2021-08-24 7:30 ` Clemens Fruhwirth [this message]
2021-08-24 8:49 ` Ævar Arnfjörð Bjarmason
2021-08-30 14:41 ` [PATCH v3] " Ævar Arnfjörð Bjarmason
2021-08-30 17:46 ` Junio C Hamano
2021-08-31 13:58 ` [PATCH v4] " Ævar Arnfjörð Bjarmason
2021-08-31 16:40 ` Junio C Hamano
2021-08-31 20:20 ` Ævar Arnfjörð Bjarmason
2021-09-01 17:44 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAG6gW_s6FHG6muJ6Hai-Sb2ntmygLymQZr8YrN212_SV1VhBAw@mail.gmail.com \
--to=clemens@endorphin.org \
--cc=avarab@gmail.com \
--cc=corentin.bompard@etu.univ-lyon1.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=poki@fnusa.cz \
/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.
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 NNTP newsgroup(s).