@@ -1677,8 +1677,6 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
1677
1677
}
1678
1678
1679
1679
if (!o -> skip_sparse_checkout ) {
1680
- int empty_worktree = 1 ;
1681
-
1682
1680
/*
1683
1681
* Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1684
1682
* If they will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
@@ -1706,19 +1704,6 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
1706
1704
1707
1705
if (apply_sparse_checkout (& o -> result , ce , o ))
1708
1706
ret = 1 ;
1709
-
1710
- if (!ce_skip_worktree (ce ))
1711
- empty_worktree = 0 ;
1712
- }
1713
- /*
1714
- * Sparse checkout is meant to narrow down checkout area
1715
- * but it does not make sense to narrow down to empty working
1716
- * tree. This is usually a mistake in sparse checkout rules.
1717
- * Do not allow users to do that.
1718
- */
1719
- if (o -> result .cache_nr && empty_worktree ) {
1720
- ret = unpack_failed (o , "Sparse checkout leaves no entry on working directory" );
1721
- goto done ;
1722
1707
}
1723
1708
if (ret == 1 ) {
1724
1709
/*
@@ -1779,7 +1764,7 @@ enum update_sparsity_result update_sparsity(struct unpack_trees_options *o)
1779
1764
{
1780
1765
enum update_sparsity_result ret = UPDATE_SPARSITY_SUCCESS ;
1781
1766
struct pattern_list pl ;
1782
- int i , empty_worktree ;
1767
+ int i ;
1783
1768
unsigned old_show_all_errors ;
1784
1769
int free_pattern_list = 0 ;
1785
1770
@@ -1810,7 +1795,6 @@ enum update_sparsity_result update_sparsity(struct unpack_trees_options *o)
1810
1795
1811
1796
/* Then loop over entries and update/remove as needed */
1812
1797
ret = UPDATE_SPARSITY_SUCCESS ;
1813
- empty_worktree = 1 ;
1814
1798
for (i = 0 ; i < o -> src_index -> cache_nr ; i ++ ) {
1815
1799
struct cache_entry * ce = o -> src_index -> cache [i ];
1816
1800
@@ -1824,28 +1808,12 @@ enum update_sparsity_result update_sparsity(struct unpack_trees_options *o)
1824
1808
1825
1809
if (apply_sparse_checkout (o -> src_index , ce , o ))
1826
1810
ret = UPDATE_SPARSITY_WARNINGS ;
1827
-
1828
- if (!ce_skip_worktree (ce ))
1829
- empty_worktree = 0 ;
1830
- }
1831
-
1832
- /*
1833
- * Sparse checkout is meant to narrow down checkout area
1834
- * but it does not make sense to narrow down to empty working
1835
- * tree. This is usually a mistake in sparse checkout rules.
1836
- * Do not allow users to do that.
1837
- */
1838
- if (o -> src_index -> cache_nr && empty_worktree ) {
1839
- unpack_failed (o , "Sparse checkout leaves no entry on working directory" );
1840
- ret = UPDATE_SPARSITY_INDEX_UPDATE_FAILURES ;
1841
- goto done ;
1842
1811
}
1843
1812
1844
1813
skip_sparse_checkout :
1845
1814
if (check_updates (o , o -> src_index ))
1846
1815
ret = UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES ;
1847
1816
1848
- done :
1849
1817
display_warning_msgs (o );
1850
1818
o -> show_all_errors = old_show_all_errors ;
1851
1819
if (free_pattern_list )
0 commit comments