Merge branch 'ps/difftool-dir-diff-exit-code' into HEAD

[thirdparty/git.git] / parallel-checkout.h

diff --git a/parallel-checkout.h b/parallel-checkout.h
index 80f539bcb77fc5e4f81656464c9a11d705d83c5f..c575284005f496de1b30add235e5973a669e27d8 100644 (file)
--- 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;