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/stash.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/stash.c')
-rw-r--r-- | builtin/stash.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index 3477e940e3..c56fed3354 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -10,11 +10,13 @@ #include "strvec.h" #include "run-command.h" #include "dir.h" +#include "entry.h" #include "rerere.h" #include "revision.h" #include "log-tree.h" #include "diffcore.h" #include "exec-cmd.h" +#include "entry.h" #define INCLUDE_ALL_FILES 2 |