diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-01 09:58:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-01 09:58:38 -0700 |
| commit | acdb1e1053c5bc0832866780bb517f7465aea7a2 (patch) | |
| tree | ba5bbd70486f552d70d8833d684ec8831dcc09c9 /builtin/checkout.c | |
| parent | f0f9a033ed3c053b6cff33fd0aed59aed1e8dc00 (diff) | |
| parent | 611c7785e8e22637e183333c54ed266e6e83e163 (diff) | |
| download | git-acdb1e1053c5bc0832866780bb517f7465aea7a2.tar.gz | |
Merge branch 'mt/checkout-count-fix'
"git checkout" miscounted the paths it updated, which has been
corrected.
source: <cover.1657799213.git.matheus.bernardino@usp.br>
* mt/checkout-count-fix:
checkout: fix two bugs on the final count of updated entries
checkout: show bug about failed entries being included in final report
checkout: document bug where delayed checkout counts entries twice
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 1109f1301f..29c74f898b 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -417,7 +417,7 @@ static int checkout_worktree(const struct checkout_opts *opts, mem_pool_discard(&ce_mem_pool, should_validate_cache_entries()); remove_marked_cache_entries(&the_index, 1); remove_scheduled_dirs(); - errs |= finish_delayed_checkout(&state, &nr_checkouts, opts->show_progress); + errs |= finish_delayed_checkout(&state, opts->show_progress); if (opts->count_checkout_paths) { if (nr_unmerged) |