diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-26 19:56:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-26 19:56:19 (GMT) |
| commit | 487fe1ffcd3b3a38477b7e564f235bb7d1b89ecc (patch) | |
| tree | 84704f656f5b21785f3879e11cf6030495d2192e /cache.h | |
| parent | 5800c63717ae35286a1441f14ffff753e01f7e2b (diff) | |
| parent | 2841e8f81cb2820024804b9341577be1d0ce1240 (diff) | |
| download | git-487fe1ffcd3b3a38477b7e564f235bb7d1b89ecc.zip git-487fe1ffcd3b3a38477b7e564f235bb7d1b89ecc.tar.gz git-487fe1ffcd3b3a38477b7e564f235bb7d1b89ecc.tar.bz2 | |
Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake
* ls/filter-process-delayed:
convert: add "status=delayed" to filter process protocol
convert: refactor capabilities negotiation
convert: move multiple file filter error handling to separate function
convert: put the flags field before the flag itself for consistent style
t0021: write "OUT <size>" only on success
t0021: make debug log file name configurable
t0021: keep filter log files on comparison
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1492,6 +1492,7 @@ struct checkout { struct index_state *istate; const char *base_dir; int base_dir_len; + struct delayed_checkout *delayed_checkout; unsigned force:1, quiet:1, not_new:1, @@ -1501,6 +1502,8 @@ struct checkout { #define TEMPORARY_FILENAME_LENGTH 25 extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath); +extern void enable_delayed_checkout(struct checkout *state); +extern int finish_delayed_checkout(struct checkout *state); struct cache_def { struct strbuf path; |