sparse-index: skip indexes with unmerged entries

The sparse-index format is designed to be compatible with merge
conflicts, even those outside the sparse-checkout definition. The reason
is that when converting a full index to a sparse one, a cache entry with
nonzero stage will not be collapsed into a sparse directory entry.

However, this behavior was not tested, and a different behavior within
convert_to_sparse() fails in this scenario. Specifically,
cache_tree_update() will fail when unmerged entries exist.
convert_to_sparse_rec() uses the cache-tree data to recursively walk the
tree structure, but also to compute the OIDs used in the
sparse-directory entries.

Add an index scan to convert_to_sparse() that will detect if these merge
conflict entries exist and skip the conversion before trying to update
the cache-tree. This is marked as NEEDSWORK because this can be removed
with a suitable update to cache_tree_update() or a similar method that
can construct a cache-tree with invalid nodes, but still allow creating
the nodes necessary for creating sparse directory entries.

It is possible that in the future we will not need to make such an
update, since if we do not expand a sparse-index into a full one, this
conversion does not need to happen. Thus, this can be deferred until the
merge machinery is made to integrate with the sparse-index.

Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sparse-index.c b/sparse-index.c
index affc4048f279f07eece8e3c5f15054208b65c4fe..2c6959302755dad6443bd0d76dbf938a07e1c5ef 100644 (file)
--- a/sparse-index.c
+++ b/sparse-index.c
@@ -116,6 +116,17 @@ int set_sparse_index_config(struct repository *repo, int enable)
        return res;
 }
 
+static int index_has_unmerged_entries(struct index_state *istate)
+{
+       int i;
+       for (i = 0; i < istate->cache_nr; i++) {
+               if (ce_stage(istate->cache[i]))
+                       return 1;
+       }
+
+       return 0;
+}
+
 int convert_to_sparse(struct index_state *istate)
 {
        int test_env;
@@ -152,6 +163,13 @@ int convert_to_sparse(struct index_state *istate)
                return -1;
        }
 
+       /*
+        * NEEDSWORK: If we have unmerged entries, then stay full.
+        * Unmerged entries prevent the cache-tree extension from working.
+        */
+       if (index_has_unmerged_entries(istate))
+               return 0;
+
        if (cache_tree_update(istate, 0)) {
                warning(_("unable to update cache-tree, staying full"));
                return -1;

diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index e9a815ca7aaaa84099b721af7db520c9f1de594b..ba2fd94adaf0f59deac4ce06a45e89e0b52ecba1 100755 (executable)
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -352,6 +352,28 @@ test_expect_success 'merge with outside renames' '
        done
 '
 
+# Sparse-index fails to convert the index in the
+# final 'git cherry-pick' command.
+test_expect_success 'cherry-pick with conflicts' '
+       init_repos &&
+
+       write_script edit-conflict <<-\EOF &&
+       echo $1 >conflict
+       EOF
+
+       test_all_match git checkout -b to-cherry-pick &&
+       run_on_all ../edit-conflict ABC &&
+       test_all_match git add conflict &&
+       test_all_match git commit -m "conflict to pick" &&
+
+       test_all_match git checkout -B base HEAD~1 &&
+       run_on_all ../edit-conflict DEF &&
+       test_all_match git add conflict &&
+       test_all_match git commit -m "conflict in base" &&
+
+       test_all_match test_must_fail git cherry-pick to-cherry-pick
+'
+
 test_expect_success 'clean' '
        init_repos &&