diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-26 11:13:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-26 11:13:13 -0700 |
| commit | 7be9f3f3353acc1e9478aaed5afe2b0778388a69 (patch) | |
| tree | 34f13edbcf701407c834abba4ab944f774c71493 /builtin | |
| parent | Merge branch 'jk/fsck-tree-mode-bits-fix' into maint (diff) | |
| parent | unpack-trees: unpack new trees as sparse directories (diff) | |
| download | git-7be9f3f3353acc1e9478aaed5afe2b0778388a69.tar.gz git-7be9f3f3353acc1e9478aaed5afe2b0778388a69.zip | |
Merge branch 'vd/sparse-reset-checkout-fixes' into maint
Fixes to sparse index compatibility work for "reset" and "checkout"
commands.
source: <pull.1312.v3.git.1659985672.gitgitgadget@gmail.com>
* 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')
| -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 df3f1663d7..cdd96cd9c6 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); |