diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-03 00:43:14 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-03 00:43:14 +0300 |
| commit | c47679d0405f134703fcae0f8f0b7ef82ecf96d5 (patch) | |
| tree | 2de6886f318b23dbbbfe9d3a68f6d6e6d66ee425 /unpack-trees.c | |
| parent | a65ce7f831aa5fcc596c6d23fcde543d98b39bd7 (diff) | |
| parent | ae22751f9b4bbbebcd0366a48a118b5a575af72d (diff) | |
Merge branch 'mt/parallel-checkout-part-1'
Preparatory API changes for parallel checkout.
* mt/parallel-checkout-part-1:
entry: add checkout_entry_ca() taking preloaded conv_attrs
entry: move conv_attrs lookup up to checkout_entry()
entry: extract update_ce_after_write() from write_entry()
entry: make fstat_output() and read_blob_entry() public
entry: extract a header file for entry.c functions
convert: add classification for conv_attrs struct
convert: add get_stream_filter_ca() variant
convert: add [async_]convert_to_working_tree_ca() variants
convert: make convert_attrs() and convert structs public
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 29029f34ed..8a1afbc1e4 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -16,6 +16,7 @@ #include "fsmonitor.h" #include "object-store.h" #include "promisor-remote.h" +#include "entry.h" /* * Error messages expected by scripts out of plumbing commands such as |