diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-10 21:52:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-10 21:52:34 -0700 |
| commit | 340a6120e5efdc37edc2a2dbc7ddc6befd5e6995 (patch) | |
| tree | 365e19c0dc3ac7bb50394e0176dd63c5476a18cf /parallel-checkout.h | |
| parent | acd3bce63fc21b50b4cfea18083a1a6ad3b04c8c (diff) | |
| parent | 611c7785e8e22637e183333c54ed266e6e83e163 (diff) | |
| download | git-340a6120e5efdc37edc2a2dbc7ddc6befd5e6995.tar.xz | |
Merge branch 'mt/checkout-count-fix' into maint
"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 'parallel-checkout.h')
| -rw-r--r-- | parallel-checkout.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/parallel-checkout.h b/parallel-checkout.h index 80f539bcb7..c575284005 100644 --- a/parallel-checkout.h +++ b/parallel-checkout.h @@ -31,7 +31,8 @@ void init_parallel_checkout(void); * entry is not eligible for parallel checkout. Otherwise, enqueue the entry * for later write and return 0. */ -int enqueue_checkout(struct cache_entry *ce, struct conv_attrs *ca); +int enqueue_checkout(struct cache_entry *ce, struct conv_attrs *ca, + int *checkout_counter); size_t pc_queue_size(void); /* @@ -68,6 +69,7 @@ struct parallel_checkout_item { struct cache_entry *ce; struct conv_attrs ca; size_t id; /* position in parallel_checkout.items[] of main process */ + int *checkout_counter; /* Output fields, sent from workers. */ enum pc_item_status status; |