Merge pull request #2254 from dbnicholson/coding-style

pull: Use GNU coding style
ostreedev · Dec 18, 2020 · fd9d422 · fd9d422
2 parents 39aa419 + 92a484d
commit fd9d422
Showing 1 changed file with 13 additions and 11 deletions.
diff --git 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)