diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:27:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:27:00 -0700 |
| commit | 51b8aecabed1363f13c990320a50e1fb2aa3f696 (patch) | |
| tree | 989a4699cd5d3e9a8a645ac67092e66ba62094d7 /builtin | |
| parent | Merge branch 'st/lib-gpg-kill-stray-agent' (diff) | |
| parent | convert: add "status=delayed" to filter process protocol (diff) | |
| download | tgif-51b8aecabed1363f13c990320a50e1fb2aa3f696.tar.xz | |
Merge branch 'ls/filter-process-delayed'
The filter-process interface learned to allow a process with long
latency give a "delayed" response.
* 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 'builtin')
| -rw-r--r-- | builtin/checkout.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 9661e1bcba..2d75ac66c7 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -358,6 +358,8 @@ static int checkout_paths(const struct checkout_opts *opts, state.force = 1; state.refresh_cache = 1; state.istate = &the_index; + + enable_delayed_checkout(&state); for (pos = 0; pos < active_nr; pos++) { struct cache_entry *ce = active_cache[pos]; if (ce->ce_flags & CE_MATCHED) { @@ -372,6 +374,7 @@ static int checkout_paths(const struct checkout_opts *opts, pos = skip_same_name(ce, pos) - 1; } } + errs |= finish_delayed_checkout(&state); if (write_locked_index(&the_index, lock_file, COMMIT_LOCK)) die(_("unable to write new index file")); |