shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-11 09:18:20 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2254 from dbnicholson/coding-style

Browse Source 
pull: Use GNU coding style
This commit is contained in:
OpenShift Merge Robot 2020-12-18 18:54:08 +00:00 committed by GitHub
commit fd9d422c51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libostree/ostree-repo-pull.c
View File

@ -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)