proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-21 20:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid copying duplicate commits

Browse Source
This commit is contained in:
Ben Straub 2012-11-08 21:29:17 -08:00
parent 11fabe73a0
commit 90207709a3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/transports/local.c
View File

@ -263,6 +263,7 @@ static int local_download_pack(
git_oid oid; git_oid oid;
git_packbuilder *pack = NULL; git_packbuilder *pack = NULL;
git_odb_writepack *writepack = NULL; git_odb_writepack *writepack = NULL;
git_odb *odb = NULL;
if ((error = git_revwalk_new(&walk, t->repo)) < 0) if ((error = git_revwalk_new(&walk, t->repo)) < 0)
goto cleanup; goto cleanup;
@ -295,10 +296,15 @@ static int local_download_pack(
} }
/* Walk the objects, building a packfile */ /* Walk the objects, building a packfile */
if ((error = git_repository_odb__weakptr(&odb, repo)) < 0)
goto cleanup;
while ((error = git_revwalk_next(&oid, walk)) == 0) { while ((error = git_revwalk_next(&oid, walk)) == 0) {
git_commit *commit; git_commit *commit;
/* Skip commits we already have */
if (git_odb_exists(odb, &oid)) continue;
stats->total_objects++; stats->total_objects++;
if (!git_object_lookup((git_object**)&commit, t->repo, &oid, GIT_OBJ_COMMIT)) { if (!git_object_lookup((git_object**)&commit, t->repo, &oid, GIT_OBJ_COMMIT)) {
@ -313,13 +319,8 @@ static int local_download_pack(
} }
if (progress_cb) progress_cb(stats, progress_payload); if (progress_cb) progress_cb(stats, progress_payload);
if ((error = git_odb_write_pack(&writepack, odb, progress_cb, progress_payload)) < 0)
{ goto cleanup;
git_odb *odb;
if ((error = git_repository_odb__weakptr(&odb, repo)) < 0 ||
(error = git_odb_write_pack(&writepack, odb, progress_cb, progress_payload)) < 0)
goto cleanup;
}
/* Write the data to the ODB */ /* Write the data to the ODB */
{ {