diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-18 23:07:04 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-18 23:07:04 +0300 |
| commit | 80ffc849bdd5ed111a2ec070856ef67e075572c6 (patch) | |
| tree | e40b7bd0e84ae6ea1fdd5066ef6c42cf98e3ecfc /builtin/checkout.c | |
| parent | 0d133a3dcf43eb0396a5899008a4ff4ceaeb0d6e (diff) | |
| parent | b15207b8cf1a1930fe5eb076c08c6ddc92d9282d (diff) | |
Merge branch 'vd/sparse-reset-checkout-fixes'
Fixes to sparse index compatibility work for "reset" and "checkout"
commands.
* vd/sparse-reset-checkout-fixes:
unpack-trees: unpack new trees as sparse directories
cache.h: create 'index_name_pos_sparse()'
oneway_diff: handle removed sparse directories
checkout: fix nested sparse directory diff in sparse index
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 29c74f898b..f9d63d80b9 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -626,6 +626,7 @@ static void show_local_changes(struct object *head, repo_init_revisions(the_repository, &rev, NULL); rev.diffopt.flags = opts->flags; rev.diffopt.output_format |= DIFF_FORMAT_NAME_STATUS; + rev.diffopt.flags.recursive = 1; diff_setup_done(&rev.diffopt); add_pending_object(&rev, head, NULL); run_diff_index(&rev, 0); |