mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/fetch-set-upstream-while-detached'

Browse Source 
"git fetch --set-upstream" did not check if there is a current
branch, leading to a segfault when it is run on a detached HEAD,
which has been corrected.

* ab/fetch-set-upstream-while-detached:
  pull, fetch: fix segfault in --set-upstream option
This commit is contained in:
Junio C Hamano
2021-12-22 22:48:10 -08:00
parent 597af311a2 17baeaf82d
commit dcaf17c75d
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/fetch.c
View File

@ -1643,6 +1643,16 @@ static int do_fetch(struct transport *transport,
}
}
if (source_ref) {
if (!branch) {
const char *shortname = source_ref->name;
skip_prefix(shortname, "refs/heads/", &shortname);
warning(_("could not set upstream of HEAD to '%s' from '%s' when "
"it does not point to any branch."),
shortname, transport->remote->name);
goto skip;
}
if (!strcmp(source_ref->name, "HEAD") ||
starts_with(source_ref->name, "refs/heads/"))
install_branch_config(0,