packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2036 from jlebon/pr/partial-parent 

lib/pull: Don't leave commits pulled by depth as partial
This commit is contained in:
OpenShift Merge Robot 2020-03-19 18:05:00 +01:00 committed by GitHub
parent 371a327dc2 fd822a8dfd
commit d0b3e76fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4719,6 +4719,13 @@ ostree_repo_pull_with_options (OstreeRepo *self,
if (!ostree_repo_mark_commit_partial (pull_data->repo, commit, FALSE, error)) if (!ostree_repo_mark_commit_partial (pull_data->repo, commit, FALSE, error))
goto out; goto out;
} }
/* and finally any parent commits we might also have pulled because of depth>0 */
GLNX_HASH_TABLE_FOREACH (pull_data->commit_to_depth, const char*, commit)
{
if (!ostree_repo_mark_commit_partial (pull_data->repo, commit, FALSE, error))
goto out;
}
} }
ret = TRUE; ret = TRUE;

18
tests/test-local-pull-depth.sh
View File

@ -34,21 +34,31 @@ ostree_repo_init repo2 --mode="archive"
${CMD_PREFIX} ostree --repo=repo2 pull-local repo ${CMD_PREFIX} ostree --repo=repo2 pull-local repo
find repo2/objects -name '*.commit' | wc -l > commitcount find repo2/objects -name '*.commit' | wc -l > commitcount
assert_file_has_content commitcount "^1$" assert_file_has_content commitcount "^1$"
find repo2/state -name '*.commitpartial' | wc -l > commitpartialcount
assert_file_has_content commitpartialcount "^0$"
${CMD_PREFIX} ostree --repo=repo2 pull-local --depth=0 repo ${CMD_PREFIX} ostree --repo=repo2 pull-local --depth=0 repo
find repo2/objects -name '*.commit' | wc -l > commitcount find repo2/objects -name '*.commit' | wc -l > commitcount
assert_file_has_content commitcount "^1$" assert_file_has_content commitcount "^1$"
find repo2/state -name '*.commitpartial' | wc -l > commitpartialcount
assert_file_has_content commitpartialcount "^0$"
${CMD_PREFIX} ostree --repo=repo2 pull-local --depth=1 --commit-metadata-only repo
find repo2/objects -name '*.commit' | wc -l > commitcount
assert_file_has_content commitcount "^2$"
find repo2/state -name '*.commitpartial' | wc -l > commitpartialcount
assert_file_has_content commitpartialcount "^1$"
${CMD_PREFIX} ostree --repo=repo2 pull-local --depth=1 repo ${CMD_PREFIX} ostree --repo=repo2 pull-local --depth=1 repo
find repo2/objects -name '*.commit' | wc -l > commitcount find repo2/objects -name '*.commit' | wc -l > commitcount
assert_file_has_content commitcount "^2$" assert_file_has_content commitcount "^2$"
find repo2/state -name '*.commitpartial' | wc -l > commitpartialcount
${CMD_PREFIX} ostree --repo=repo2 pull-local --depth=1 repo assert_file_has_content commitpartialcount "^0$"
find repo2/objects -name '*.commit' | wc -l > commitcount
assert_file_has_content commitcount "^2$"
${CMD_PREFIX} ostree --repo=repo2 pull-local --depth=-1 repo ${CMD_PREFIX} ostree --repo=repo2 pull-local --depth=-1 repo
find repo2/objects -name '*.commit' | wc -l > commitcount find repo2/objects -name '*.commit' | wc -l > commitcount
assert_file_has_content commitcount "^2$" assert_file_has_content commitcount "^2$"
find repo2/state -name '*.commitpartial' | wc -l > commitpartialcount
assert_file_has_content commitpartialcount "^0$"
echo "ok local pull depth" echo "ok local pull depth"