mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-storage: make creation of empty cache repo set the initial branch

Browse source 
In create_and_push_remote(), we set up the remote tracking etc to use
the proper branch name, but never actually set up the initial local
branch for the new cache repository at all.  So the repository would end
up with the default 'master' branch, instead of the branch name it
should have.

This went unnoticed, because most setups start by initializing the git
caches by cloning from the cloud, and that worked fine.

Debugged-by: Dirk Hohndel <dirk@hohndel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2020-04-14 15:12:56 -07:00 committed by Dirk Hohndel
parent ebb342c969
commit 433149af19
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/git-access.c
View file

@ -703,7 +703,7 @@ static git_repository *create_and_push_remote(const char *localdir, const char *
{ {
git_repository *repo; git_repository *repo;
git_config *conf; git_config *conf;
char *variable_name, *merge_head; char *variable_name, *head;
if (verbose) if (verbose)
fprintf(stderr, "git storage: create and push remote\n"); fprintf(stderr, "git storage: create and push remote\n");
@ -711,9 +711,12 @@ static git_repository *create_and_push_remote(const char *localdir, const char *
/* first make sure the directory for the local cache exists */ /* first make sure the directory for the local cache exists */
subsurface_mkdir(localdir); subsurface_mkdir(localdir);
head = format_string("refs/heads/%s", branch);
/* set up the origin to point to our remote */ /* set up the origin to point to our remote */
git_repository_init_options init_opts = GIT_REPOSITORY_INIT_OPTIONS_INIT; git_repository_init_options init_opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;
init_opts.origin_url = remote; init_opts.origin_url = remote;
init_opts.initial_head = head;
/* now initialize the repository with */ /* now initialize the repository with */
git_repository_init_ext(&repo, localdir, &init_opts); git_repository_init_ext(&repo, localdir, &init_opts);
@ -725,9 +728,8 @@ static git_repository *create_and_push_remote(const char *localdir, const char *
free(variable_name); free(variable_name);
variable_name = format_string("branch.%s.merge", branch); variable_name = format_string("branch.%s.merge", branch);
merge_head = format_string("refs/heads/%s", branch); git_config_set_string(conf, variable_name, head);
git_config_set_string(conf, variable_name, merge_head); free(head);
free(merge_head);
free(variable_name); free(variable_name);
/* finally create an empty commit and push it to the remote */ /* finally create an empty commit and push it to the remote */