From 1c04dd0d598ef3eae9b9b4fda67c5d4c4986122a Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Fri, 18 Dec 2020 09:13:38 -0700 Subject: [PATCH] pull: Use GNU coding style (cherry picked from commit 92a484d278b653ea6b1c0fa9c1997bb5faf074a0) https://phabricator.endlessm.com/T20138 --- src/libostree/ostree-repo-pull.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c index dc4cd332a..e59ba48a9 100644 --- a/src/libostree/ostree-repo-pull.c +++ b/src/libostree/ostree-repo-pull.c @@ -1620,17 +1620,19 @@ scan_commit_object (OtPullData *pull_data, if (!ostree_repo_load_commit (pull_data->repo, checksum, &commit, &commitstate, error)) return FALSE; - if (!pull_data->disable_verify_bindings) { - /* If ref is non-NULL then the commit we fetched was requested through the - * branch, otherwise we requested a commit checksum without specifying a branch. - */ - g_autofree char *remote_collection_id = NULL; - remote_collection_id = get_remote_repo_collection_id (pull_data); - if (!_ostree_repo_verify_bindings (remote_collection_id, - (ref != NULL) ? ref->ref_name : NULL, - commit, error)) - return glnx_prefix_error (error, "Commit %s", checksum); - } + if (!pull_data->disable_verify_bindings) + { + /* If ref is non-NULL then the commit we fetched was requested through + * the branch, otherwise we requested a commit checksum without + * specifying a branch. + */ + g_autofree char *remote_collection_id = NULL; + remote_collection_id = get_remote_repo_collection_id (pull_data); + if (!_ostree_repo_verify_bindings (remote_collection_id, + (ref != NULL) ? ref->ref_name : NULL, + commit, error)) + return glnx_prefix_error (error, "Commit %s", checksum); + } guint64 new_ts = ostree_commit_get_timestamp (commit); if (pull_data->timestamp_check)