From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Apr 2021 21:43:14 +0000 (-0700)
Subject: Merge branch 'mt/parallel-checkout-part-1'
X-Git-Tag: v2.32.0-rc0~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c47679d0405f134703fcae0f8f0b7ef82ecf96d5;p=thirdparty%2Fgit.git

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
---

c47679d0405f134703fcae0f8f0b7ef82ecf96d5
diff --cc builtin/stash.c
index 3477e940e3,11f3ae3039..c56fed3354
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@@ -10,6 -10,6 +10,7 @@@
  #include "strvec.h"
  #include "run-command.h"
  #include "dir.h"
++#include "entry.h"
  #include "rerere.h"
  #include "revision.h"
  #include "log-tree.h"