diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-01-21 08:44:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-21 08:44:54 -0800 |
| commit | 7b39a128c814a2362d0533c7df0ab7a2fef6fa4b (patch) | |
| tree | 6f348b269516bb30655e03ef6a637609d007c5d2 /unpack-trees.c | |
| parent | Merge branch 'jt/fsck-skiplist-parse-fix' (diff) | |
| parent | match-trees: stop using `the_repository` (diff) | |
| download | git-7b39a128c814a2362d0533c7df0ab7a2fef6fa4b.tar.gz git-7b39a128c814a2362d0533c7df0ab7a2fef6fa4b.zip | |
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`
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index b3be5d542f..334cb84f65 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -372,7 +372,8 @@ static struct progress *get_progress(struct unpack_trees_options *o, total++; } - return start_delayed_progress(_("Updating files"), total); + return start_delayed_progress(the_repository, + _("Updating files"), total); } static void setup_collided_checkout_detection(struct checkout *state, @@ -1773,6 +1774,7 @@ static int clear_ce_flags(struct index_state *istate, strbuf_reset(&prefix); if (show_progress) istate->progress = start_delayed_progress( + the_repository, _("Updating index flags"), istate->cache_nr); |