Commit c4e796b22e894d9f1b17844f6b2f05acadf519aa
2022-03-21T16:08:41
in pack progress output, remove excluded objects from 'found' objects counter
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 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83
diff --git a/lib/pack_create.c b/lib/pack_create.c
index d758916..bcd49de 100644
--- a/lib/pack_create.c
+++ b/lib/pack_create.c
@@ -930,11 +930,14 @@ load_tree_entries(struct got_object_id_queue *ids, int want_meta,
GOT_OBJ_TYPE_BLOB, mtime, loose_obj_only, repo);
if (err)
break;
- (*nfound)++;
- err = report_progress(progress_cb, progress_arg, rl,
- *ncolored, *nfound, *ntrees, 0L, 0, 0, 0, 0);
- if (err)
- break;
+ if (want_meta) {
+ (*nfound)++;
+ err = report_progress(progress_cb, progress_arg,
+ rl, *ncolored, *nfound, *ntrees,
+ 0L, 0, 0, 0, 0);
+ if (err)
+ break;
+ }
}
free(p);
p = NULL;
@@ -989,12 +992,14 @@ load_tree(int want_meta, struct got_object_idset *idset,
break;
}
- (*nfound)++;
- err = report_progress(progress_cb, progress_arg, rl,
- *ncolored, *nfound, *ntrees, 0L, 0, 0, 0, 0);
- if (err)
- break;
-
+ if (want_meta) {
+ (*nfound)++;
+ err = report_progress(progress_cb, progress_arg, rl,
+ *ncolored, *nfound, *ntrees, 0L, 0, 0, 0, 0);
+ if (err)
+ break;
+ }
+
err = load_tree_entries(&tree_ids, want_meta, idset, qid->id,
dpath, mtime, repo, loose_obj_only, ncolored, nfound,
ntrees, progress_cb, progress_arg, rl,
@@ -1040,11 +1045,13 @@ load_commit(int want_meta, struct got_object_idset *idset,
if (err)
goto done;
- (*nfound)++;
- err = report_progress(progress_cb, progress_arg, rl,
- *ncolored, *nfound, *ntrees, 0L, 0, 0, 0, 0);
- if (err)
- goto done;
+ if (want_meta) {
+ (*nfound)++;
+ err = report_progress(progress_cb, progress_arg, rl,
+ *ncolored, *nfound, *ntrees, 0L, 0, 0, 0, 0);
+ if (err)
+ goto done;
+ }
err = load_tree(want_meta, idset, got_object_commit_get_tree_id(commit),
"", got_object_commit_get_committer_time(commit),
@@ -1087,11 +1094,13 @@ load_tag(int want_meta, struct got_object_idset *idset,
if (err)
goto done;
- (*nfound)++;
- err = report_progress(progress_cb, progress_arg, rl,
- *ncolored, *nfound, *ntrees, 0L, 0, 0, 0, 0);
- if (err)
- goto done;
+ if (want_meta) {
+ (*nfound)++;
+ err = report_progress(progress_cb, progress_arg, rl,
+ *ncolored, *nfound, *ntrees, 0L, 0, 0, 0, 0);
+ if (err)
+ goto done;
+ }
switch (got_object_tag_get_object_type(tag)) {
case GOT_OBJ_TYPE_COMMIT: