summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2022-02-21 14:23:39 -0500
committerGitHub <noreply@github.com>2022-02-21 14:23:39 -0500
commit4304505af85c19ebe7a61d3fb972b3761d89395a (patch)
tree25b582d9874a8414a076ecae6d06e885de67b366
parent4066b0ab4578add593c49448fb7553fdee656911 (diff)
parentc213dd3a84bf901656297bbecc341a70cf0706cb (diff)
downloadostree-4304505af85c19ebe7a61d3fb972b3761d89395a.tar.gz
Merge pull request #2549 from ostreedev/mwleeds/fix-partial-delta-fetches
Fix marking static delta commits as partial
-rw-r--r--src/libostree/ostree-repo-pull.c3
-rw-r--r--src/libostree/ostree-repo-refs.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 65b56789..e8918cf6 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -2244,6 +2244,9 @@ process_one_static_delta (OtPullData *pull_data,
ref, cancellable, error))
return FALSE;
+ if (!ostree_repo_mark_commit_partial (pull_data->repo, to_revision, TRUE, error))
+ return FALSE;
+
if (detached_data && !ostree_repo_write_commit_detached_metadata (pull_data->repo,
to_revision,
detached_data,
diff --git a/src/libostree/ostree-repo-refs.c b/src/libostree/ostree-repo-refs.c
index 8d010729..86bd27c5 100644
--- a/src/libostree/ostree-repo-refs.c
+++ b/src/libostree/ostree-repo-refs.c
@@ -396,7 +396,6 @@ _ostree_repo_resolve_rev_internal (OstreeRepo *self,
{
ret_rev = g_strdup (refspec);
}
-
else if (!ostree_repo_resolve_partial_checksum (self, refspec, &ret_rev, error))
return FALSE;