From: Nguyễn Thái Ngọc Duy Date: Mon, 14 Dec 2009 10:31:06 GMT Subject: [PATCH 23/23] sparse checkout: inhibit empty worktree Message-ID: <1260786666-8405-24-git-send-email-pclouds@gmail.com> In-Reply-To: <1260786666-8405-1-git-send-email-pclouds@gmail.com> The way sparse checkout works, users may empty their worktree completely, because of non-matching sparse-checkout spec, or empty spec. I believe this is not desired. This patch makes Git refuse to produce such worktree. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- t/t1011-read-tree-sparse-checkout.sh | 10 +++------- unpack-trees.c | 7 +++++++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh index 2192f5a..62246db 100755 --- a/t/t1011-read-tree-sparse-checkout.sh +++ b/t/t1011-read-tree-sparse-checkout.sh @@ -55,20 +55,16 @@ test_expect_success 'read-tree --no-sparse-checkout with empty .git/info/sparse- test -f sub/added ' -cat >expected.swt < .git/info/sparse-checkout && - git read-tree -m -u HEAD && + test_must_fail git read-tree -m -u HEAD && git ls-files --stage > result && test_cmp expected result && git ls-files -t > result && test_cmp expected.swt result && - test ! -f init.t && - test ! -f sub/added + test -f init.t && + test -f sub/added ' cat >expected.swt <skip_sparse_checkout) { + int empty_worktree = 1; for (i = 0;i < o->result.cache_nr;i++) { struct cache_entry *ce = o->result.cache[i]; @@ -512,8 +513,14 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options */ if (ce_skip_worktree(ce)) ce->ce_flags &= ~(CE_UPDATE | CE_REMOVE); + else + empty_worktree = 0; } + if (o->result.cache_nr && empty_worktree) { + ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory"); + goto done; + } } o->src_index = NULL; -- 1.6.5.2.216.g9c1ec