mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-01-28 17:41:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

builder: Fix --from-git

Browse Source 
We need to specify the full branch when checking out
This commit is contained in:
Alexander Larsson
2017-03-07 14:20:44 +01:00
parent 640a02315b
commit ea6747fcb4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builder/builder-main.c
View File

@@ -339,12 +339,13 @@ main (int argc,
if (opt_from_git)
{
g_autofree char *manifest_dirname = g_path_get_dirname (manifest_rel_path);
const char *git_branch = opt_from_git_branch ? opt_from_git_branch : "master";
g_autofree char *git_origin_branch = g_strconcat ("origin/", git_branch, NULL);
g_autoptr(GFile) build_subdir = NULL;
if (!builder_git_mirror_repo (opt_from_git,
!opt_disable_updates, FALSE,
opt_from_git_branch ? opt_from_git_branch : "master",
build_context, &error))
git_branch, build_context, &error))
{
g_printerr ("Can't clone manifest repo: %s\n", error->message);
return 1;
@@ -360,7 +361,7 @@ main (int argc,
cleanup_manifest_dir = g_object_ref (build_subdir);
if (!builder_git_checkout_dir (opt_from_git,
opt_from_git_branch ? opt_from_git_branch : "master",
git_origin_branch,
manifest_dirname,
build_subdir,
build_context,