Merge branch 'ps/the-repository'
More code paths have a repository passed through the callchain, instead of assuming the primary the_repository object. * ps/the-repository: match-trees: stop using `the_repository` graph: stop using `the_repository` add-interactive: stop using `the_repository` tmp-objdir: stop using `the_repository` resolve-undo: stop using `the_repository` credential: stop using `the_repository` mailinfo: stop using `the_repository` diagnose: stop using `the_repository` server-info: stop using `the_repository` send-pack: stop using `the_repository` serve: stop using `the_repository` trace: stop using `the_repository` pager: stop using `the_repository` progress: stop using `the_repository`
This commit is contained in:
@@ -282,7 +282,8 @@ static unsigned check_objects(void)
|
||||
max = get_max_object_index();
|
||||
|
||||
if (verbose)
|
||||
progress = start_delayed_progress(_("Checking objects"), max);
|
||||
progress = start_delayed_progress(the_repository,
|
||||
_("Checking objects"), max);
|
||||
|
||||
for (i = 0; i < max; i++) {
|
||||
foreign_nr += check_object(get_indexed_object(i));
|
||||
@@ -1249,6 +1250,7 @@ static void parse_pack_objects(unsigned char *hash)
|
||||
|
||||
if (verbose)
|
||||
progress = start_progress(
|
||||
the_repository,
|
||||
progress_title ? progress_title :
|
||||
from_stdin ? _("Receiving objects") : _("Indexing objects"),
|
||||
nr_objects);
|
||||
@@ -1329,7 +1331,8 @@ static void resolve_deltas(struct pack_idx_option *opts)
|
||||
QSORT(ref_deltas, nr_ref_deltas, compare_ref_delta_entry);
|
||||
|
||||
if (verbose || show_resolving_progress)
|
||||
progress = start_progress(_("Resolving deltas"),
|
||||
progress = start_progress(the_repository,
|
||||
_("Resolving deltas"),
|
||||
nr_ref_deltas + nr_ofs_deltas);
|
||||
|
||||
nr_dispatched = 0;
|
||||
|
||||
Reference in New Issue
Block a user