Merge branch 'en/sparse-checkout'

[thirdparty/git.git] / unpack-trees.c

diff --git a/unpack-trees.c b/unpack-trees.c
index 8caf5e8ecc43e10b835279d915548b0d424ba6e6..4be5fc3075410f4004b9d5fc1902eb84880dded5 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -404,6 +404,7 @@ static int check_updates(struct unpack_trees_options *o,
        state.quiet = 1;
        state.refresh_cache = 1;
        state.istate = index;
+       clone_checkout_metadata(&state.meta, &o->meta, NULL);
 
        if (!o->update || o->dry_run) {
                remove_marked_cache_entries(index, 0);
@@ -455,9 +456,8 @@ static int check_updates(struct unpack_trees_options *o,
                                continue;
                        oid_array_append(&to_fetch, &ce->oid);
                }
-               if (to_fetch.nr)
-                       promisor_remote_get_direct(the_repository,
-                                                  to_fetch.oid, to_fetch.nr);
+               promisor_remote_get_direct(the_repository,
+                                          to_fetch.oid, to_fetch.nr);
                oid_array_clear(&to_fetch);
        }
        for (i = 0; i < index->cache_nr; i++) {
@@ -562,11 +562,11 @@ static int warn_conflicted_path(struct index_state *istate,
 
        add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path);
 
-       /* Find out how many higher stage entries at same path */
-       while (++count < istate->cache_nr &&
-              !strcmp(conflicting_path,
-                      istate->cache[i+count]->name))
-               /* do nothing */;
+       /* Find out how many higher stage entries are at same path */
+       while ((++count) + i < istate->cache_nr &&
+              !strcmp(conflicting_path, istate->cache[count + i]->name))
+               ; /* do nothing */
+
        return count;
 }
 
@@ -1677,8 +1677,6 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
        }
 
        if (!o->skip_sparse_checkout) {
-               int empty_worktree = 1;
-
                /*
                 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
                 * 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
 
                        if (apply_sparse_checkout(&o->result, ce, o))
                                ret = 1;
-
-                       if (!ce_skip_worktree(ce))
-                               empty_worktree = 0;
-               }
-               /*
-                * Sparse checkout is meant to narrow down checkout area
-                * but it does not make sense to narrow down to empty working
-                * tree. This is usually a mistake in sparse checkout rules.
-                * Do not allow users to do that.
-                */
-               if (o->result.cache_nr && empty_worktree) {
-                       ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");
-                       goto done;
                }
                if (ret == 1) {
                        /*
@@ -1779,7 +1764,7 @@ enum update_sparsity_result update_sparsity(struct unpack_trees_options *o)
 {
        enum update_sparsity_result ret = UPDATE_SPARSITY_SUCCESS;
        struct pattern_list pl;
-       int i, empty_worktree;
+       int i;
        unsigned old_show_all_errors;
        int free_pattern_list = 0;
 
@@ -1810,7 +1795,6 @@ enum update_sparsity_result update_sparsity(struct unpack_trees_options *o)
 
        /* Then loop over entries and update/remove as needed */
        ret = UPDATE_SPARSITY_SUCCESS;
-       empty_worktree = 1;
        for (i = 0; i < o->src_index->cache_nr; i++) {
                struct cache_entry *ce = o->src_index->cache[i];
 
@@ -1824,28 +1808,12 @@ enum update_sparsity_result update_sparsity(struct unpack_trees_options *o)
 
                if (apply_sparse_checkout(o->src_index, ce, o))
                        ret = UPDATE_SPARSITY_WARNINGS;
-
-               if (!ce_skip_worktree(ce))
-                       empty_worktree = 0;
-       }
-
-       /*
-        * Sparse checkout is meant to narrow down checkout area
-        * but it does not make sense to narrow down to empty working
-        * tree. This is usually a mistake in sparse checkout rules.
-        * Do not allow users to do that.
-        */
-       if (o->src_index->cache_nr && empty_worktree) {
-               unpack_failed(o, "Sparse checkout leaves no entry on working directory");
-               ret = UPDATE_SPARSITY_INDEX_UPDATE_FAILURES;
-               goto done;
        }
 
 skip_sparse_checkout:
        if (check_updates(o, o->src_index))
                ret = UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES;
 
-done:
        display_warning_msgs(o);
        o->show_all_errors = old_show_all_errors;
        if (free_pattern_list)
@@ -1964,9 +1932,6 @@ static void invalidate_ce_path(const struct cache_entry *ce,
 /*
  * Check that checking out ce->sha1 in subdir ce->name is not
  * going to overwrite any working files.
- *
- * Currently, git does not checkout subprojects during a superproject
- * checkout, so it is not going to overwrite anything.
  */
 static int verify_clean_submodule(const char *old_sha1,
                                  const struct cache_entry *ce,
@@ -2212,7 +2177,7 @@ static int merged_entry(const struct cache_entry *ce,
                }
                invalidate_ce_path(merge, o);
 
-               if (submodule_from_ce(ce)) {
+               if (submodule_from_ce(ce) && file_exists(ce->name)) {
                        int ret = check_submodule_move_head(ce, NULL,
                                                            oid_to_hex(&ce->oid),
                                                            o);
@@ -2241,7 +2206,7 @@ static int merged_entry(const struct cache_entry *ce,
                        invalidate_ce_path(old, o);
                }
 
-               if (submodule_from_ce(ce)) {
+               if (submodule_from_ce(ce) && file_exists(ce->name)) {
                        int ret = check_submodule_move_head(ce, oid_to_hex(&old->oid),
                                                            oid_to_hex(&ce->oid),
                                                            o);