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 /builtin/checkout.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 'builtin/checkout.c')
-rw-r--r-- | builtin/checkout.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 0e66390520..4c696ef480 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -26,6 +26,7 @@ #include "unpack-trees.h" #include "wt-status.h" #include "xdiff-interface.h" +#include "entry.h" static const char * const checkout_usage[] = { N_("git checkout [<options>] <branch>"), |