core: Misc bugfixes for commit
This commit is contained in:
parent
ea6a761265
commit
84e85a8377
|
|
@ -195,7 +195,7 @@ ostree_builtin_commit (int argc, char **argv, const char *repo_path, GError **er
|
||||||
GOptionContext *context;
|
GOptionContext *context;
|
||||||
gboolean ret = FALSE;
|
gboolean ret = FALSE;
|
||||||
OstreeRepo *repo = NULL;
|
OstreeRepo *repo = NULL;
|
||||||
char *dir;
|
char *dir = NULL;
|
||||||
gboolean using_filename_cmdline;
|
gboolean using_filename_cmdline;
|
||||||
gboolean using_filedescriptors;
|
gboolean using_filedescriptors;
|
||||||
GPtrArray *additions_array = NULL;
|
GPtrArray *additions_array = NULL;
|
||||||
|
|
@ -204,7 +204,7 @@ ostree_builtin_commit (int argc, char **argv, const char *repo_path, GError **er
|
||||||
char **iter;
|
char **iter;
|
||||||
char separator;
|
char separator;
|
||||||
GVariant *metadata = NULL;
|
GVariant *metadata = NULL;
|
||||||
GMappedFile *metadata_mappedf;
|
GMappedFile *metadata_mappedf = NULL;
|
||||||
GFile *metadata_f = NULL;
|
GFile *metadata_f = NULL;
|
||||||
|
|
||||||
context = g_option_context_new ("[DIR] - Commit a new revision");
|
context = g_option_context_new ("[DIR] - Commit a new revision");
|
||||||
|
|
@ -348,7 +348,7 @@ ostree_builtin_commit (int argc, char **argv, const char *repo_path, GError **er
|
||||||
fdata.out = out;
|
fdata.out = out;
|
||||||
fdata.cancellable = NULL;
|
fdata.cancellable = NULL;
|
||||||
|
|
||||||
if (g_thread_create (find_thread, &fdata, FALSE, error) == NULL)
|
if (g_thread_create_full (find_thread, &fdata, 0, FALSE, FALSE, G_THREAD_PRIORITY_NORMAL, error) == NULL)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (!ostree_repo_commit_from_filelist_fd (repo, branch, parent, subject, body, metadata,
|
if (!ostree_repo_commit_from_filelist_fd (repo, branch, parent, subject, body, metadata,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue