diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-26 12:56:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-26 12:56:19 -0700 |
| commit | 487fe1ffcd3b3a38477b7e564f235bb7d1b89ecc (patch) | |
| tree | 84704f656f5b21785f3879e11cf6030495d2192e /unpack-trees.c | |
| parent | 5800c63717ae35286a1441f14ffff753e01f7e2b (diff) | |
| parent | 2841e8f81cb2820024804b9341577be1d0ce1240 (diff) | |
| download | git-487fe1ffcd3b3a38477b7e564f235bb7d1b89ecc.tar.gz | |
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 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index dd535bc849..862cfce661 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -380,6 +380,7 @@ static int check_updates(struct unpack_trees_options *o) if (should_update_submodules() && o->update && !o->dry_run) reload_gitmodules_file(index, &state); + enable_delayed_checkout(&state); for (i = 0; i < index->cache_nr; i++) { struct cache_entry *ce = index->cache[i]; @@ -394,6 +395,7 @@ static int check_updates(struct unpack_trees_options *o) } } } + errs |= finish_delayed_checkout(&state); stop_progress(&progress); if (o->update) git_attr_set_direction(GIT_ATTR_CHECKIN, NULL); |