* [PATCH] fetch: Fix segfault on pull --set-upstream outside a branch.
@ 2021-07-06 16:22 Clemens Fruhwirth
2021-07-06 17:57 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Clemens Fruhwirth @ 2021-07-06 16:22 UTC (permalink / raw)
To: git; +Cc: Clemens Fruhwirth
branch_get("HEAD") can return NULL, when we are outside a branch and
the user calls pull --set-upstream. Catch this case and warn the user
to avoid a segfault.
Signed-off-by: Clemens Fruhwirth <clemens@endorphin.org>
---
builtin/fetch.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 9191620e50..1097235b90 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1602,6 +1602,10 @@ static int do_fetch(struct transport *transport,
struct ref *rm;
struct ref *source_ref = NULL;
+ if (!branch) {
+ warning(_("no branch detected to use --set-upstream with."));
+ goto skip;
+ }
/*
* We're setting the upstream configuration for the
* current branch. The relevant upstream is the
--
2.31.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] fetch: Fix segfault on pull --set-upstream outside a branch.
2021-07-06 16:22 [PATCH] fetch: Fix segfault on pull --set-upstream outside a branch Clemens Fruhwirth
@ 2021-07-06 17:57 ` Junio C Hamano
2021-07-06 18:03 ` Eric Sunshine
2021-07-06 19:48 ` Junio C Hamano
0 siblings, 2 replies; 5+ messages in thread
From: Junio C Hamano @ 2021-07-06 17:57 UTC (permalink / raw)
To: Clemens Fruhwirth; +Cc: git
Clemens Fruhwirth <clemens@endorphin.org> writes:
> branch_get("HEAD") can return NULL, when we are outside a branch and
> the user calls pull --set-upstream. Catch this case and warn the user
> to avoid a segfault.
Nit. What do you mean by "outside a branch"? If you mean "when the
HEAD is detached", please say so, and use the same terminology in
your warning message.
Thanks.
>
> Signed-off-by: Clemens Fruhwirth <clemens@endorphin.org>
> ---
> builtin/fetch.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index 9191620e50..1097235b90 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -1602,6 +1602,10 @@ static int do_fetch(struct transport *transport,
> struct ref *rm;
> struct ref *source_ref = NULL;
>
> + if (!branch) {
> + warning(_("no branch detected to use --set-upstream with."));
> + goto skip;
> + }
> /*
> * We're setting the upstream configuration for the
> * current branch. The relevant upstream is the
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] fetch: Fix segfault on pull --set-upstream outside a branch.
2021-07-06 17:57 ` Junio C Hamano
@ 2021-07-06 18:03 ` Eric Sunshine
2021-07-06 19:48 ` Junio C Hamano
1 sibling, 0 replies; 5+ messages in thread
From: Eric Sunshine @ 2021-07-06 18:03 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Clemens Fruhwirth, Git List
On Tue, Jul 6, 2021 at 1:57 PM Junio C Hamano <gitster@pobox.com> wrote:
> Clemens Fruhwirth <clemens@endorphin.org> writes:
>
> > branch_get("HEAD") can return NULL, when we are outside a branch and
> > the user calls pull --set-upstream. Catch this case and warn the user
> > to avoid a segfault.
>
> Nit. What do you mean by "outside a branch"? If you mean "when the
> HEAD is detached", please say so, and use the same terminology in
> your warning message.
Also, adding a new test, probably to `t/t5553-set-upstream.sh`, would
be welcome. The test can likely be as simple as ensuring that the
command does not crash, and perhaps check that the outcome was as
expected.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] fetch: Fix segfault on pull --set-upstream outside a branch.
2021-07-06 17:57 ` Junio C Hamano
2021-07-06 18:03 ` Eric Sunshine
@ 2021-07-06 19:48 ` Junio C Hamano
2021-07-06 19:50 ` Junio C Hamano
1 sibling, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2021-07-06 19:48 UTC (permalink / raw)
To: Clemens Fruhwirth; +Cc: git
Junio C Hamano <gitster@pobox.com> writes:
> Nit. What do you mean by "outside a branch"? If you mean "when the
> HEAD is detached", please say so, and use the same terminology in
> your warning message.
Here is what I queued for today's integration run. Eric's
suggestion to add a simple test is a good idea, too.
Thanks.
-- >8 --
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Tue, 6 Jul 2021 18:22:38 +0200
Subject: [PATCH] fetch: fix segfault on pull --set-upstream while on a detached HEAD
branch_get("HEAD") can return NULL, when HEAD is detached, and cause
the code to segfault when the user calls "pull --set-upstream".
Catch this case and warn the user to avoid a segfault.
Signed-off-by: Clemens Fruhwirth <clemens@endorphin.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/fetch.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index dfde96a435..0a11430df4 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1602,6 +1602,10 @@ static int do_fetch(struct transport *transport,
struct ref *rm;
struct ref *source_ref = NULL;
+ if (!branch) {
+ warning(_("no branch detected to use --set-upstream with."));
+ goto skip;
+ }
/*
* We're setting the upstream configuration for the
* current branch. The relevant upstream is the
--
2.32.0-288-g654beb0eda
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] fetch: Fix segfault on pull --set-upstream outside a branch.
2021-07-06 19:48 ` Junio C Hamano
@ 2021-07-06 19:50 ` Junio C Hamano
0 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2021-07-06 19:50 UTC (permalink / raw)
To: Clemens Fruhwirth; +Cc: git
Junio C Hamano <gitster@pobox.com> writes:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Nit. What do you mean by "outside a branch"? If you mean "when the
>> HEAD is detached", please say so, and use the same terminology in
>> your warning message.
>
> Here is what I queued for today's integration run. Eric's
> suggestion to add a simple test is a good idea, too.
Oops, wrong patch.
-- >8 --
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Tue, 6 Jul 2021 18:22:38 +0200
Subject: [PATCH] fetch: fix segfault on --set-upstream while on a detached HEAD
branch_get("HEAD") can return NULL, when HEAD is detached, and cause
the code to segfault when the user calls "git pull --set-upstream".
Catch this case and warn the user to avoid a segfault.
Signed-off-by: Clemens Fruhwirth <clemens@endorphin.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/fetch.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index dfde96a435..4efdd28396 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1602,6 +1602,10 @@ static int do_fetch(struct transport *transport,
struct ref *rm;
struct ref *source_ref = NULL;
+ if (!branch) {
+ warning(_("not on a branch to use --set-upstream with"));
+ goto skip;
+ }
/*
* We're setting the upstream configuration for the
* current branch. The relevant upstream is the
--
2.32.0-288-g654beb0eda
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-07-06 19:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-06 16:22 [PATCH] fetch: Fix segfault on pull --set-upstream outside a branch Clemens Fruhwirth
2021-07-06 17:57 ` Junio C Hamano
2021-07-06 18:03 ` Eric Sunshine
2021-07-06 19:48 ` Junio C Hamano
2021-07-06 19:50 ` Junio C Hamano
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).