summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn@endlessos.org>2020-12-18 09:13:38 -0700
committerDan Nicholson <dbn@endlessos.org>2020-12-18 09:13:38 -0700
commit92a484d278b653ea6b1c0fa9c1997bb5faf074a0 (patch)
tree618f5bd90279a7448e779e362fba113aaa3e105a
parent39aa419dfad16b9d13c42a5ef4d72517043d0e55 (diff)
downloadostree-92a484d278b653ea6b1c0fa9c1997bb5faf074a0.tar.gz
pull: Use GNU coding style
-rw-r--r--src/libostree/ostree-repo-pull.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index c9b03312..7d4b91e2 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)