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 /diff-lib.c | |
| parent | e5cb51d3aa2e522a571a74a9664a538a40fc7d64 (diff) | |
| parent | b15207b8cf1a1930fe5eb076c08c6ddc92d9282d (diff) | |
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 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/diff-lib.c b/diff-lib.c index 7eb66a417a..2edea41a23 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -466,6 +466,11 @@ static void do_oneway_diff(struct unpack_trees_options *o, * Something removed from the tree? */ if (!idx) { + if (S_ISSPARSEDIR(tree->ce_mode)) { + diff_tree_oid(&tree->oid, NULL, tree->name, &revs->diffopt); + return; + } + diff_index_show_file(revs, "-", tree, &tree->oid, 1, tree->ce_mode, 0); return; |