Commit 9d34261edbfb3574a41b29233fdc722b526ea226
2022-04-07T20:55:39
in load_object_ids(), process "their" commits and tags in the same loop No functional change, the end result is the same.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
diff --git a/lib/pack_create.c b/lib/pack_create.c
index e852bc8..2367bba 100644
--- a/lib/pack_create.c
+++ b/lib/pack_create.c
@@ -1404,34 +1404,21 @@ load_object_ids(int *ncolored, int *nfound, int *ntrees,
err = got_object_get_type(&obj_type, repo, id);
if (err)
return err;
- if (obj_type != GOT_OBJ_TYPE_COMMIT)
- continue;
- err = load_commit(0, idset, id, repo, loose_obj_only,
- ncolored, nfound, ntrees, progress_cb, progress_arg, rl,
- cancel_cb, cancel_arg);
- if (err)
- goto done;
- }
-
- for (i = 0; i < ntheirs; i++) {
- struct got_object_id *id = theirs[i];
- struct got_pack_meta *m;
- if (id == NULL)
- continue;
- m = got_object_idset_get(idset, id);
- if (m == NULL) {
- err = got_object_get_type(&obj_type, repo, id);
+ if (obj_type == GOT_OBJ_TYPE_COMMIT) {
+ err = load_commit(0, idset, id, repo,
+ loose_obj_only, ncolored, nfound, ntrees,
+ progress_cb, progress_arg, rl,
+ cancel_cb, cancel_arg);
if (err)
goto done;
- } else
- obj_type = m->obj_type;
- if (obj_type != GOT_OBJ_TYPE_TAG)
- continue;
- err = load_tag(0, idset, id, repo, loose_obj_only,
- ncolored, nfound, ntrees, progress_cb, progress_arg, rl,
- cancel_cb, cancel_arg);
- if (err)
- goto done;
+ } else if (obj_type == GOT_OBJ_TYPE_TAG) {
+ err = load_tag(0, idset, id, repo,
+ loose_obj_only, ncolored, nfound, ntrees,
+ progress_cb, progress_arg, rl,
+ cancel_cb, cancel_arg);
+ if (err)
+ goto done;
+ }
}
for (i = 0; i < nobj; i++) {