Re: [PATCH 4/6] merge-ort: expand only for out-of-cone conflicts
flat view
From: Elijah Newren <hidden>
Date: 2021-08-20 21:53:49
On Tue, Aug 17, 2021 at 10:08 AM Derrick Stolee via GitGitGadget [off-list ref] wrote:
From: Derrick Stolee <redacted> Merge conflicts happen often enough to want to avoid expanding a sparse index when they happen, as long as those conflicts are within the sparse-checkout cone. If a conflict exists outside of the sparse-checkout cone, then we still need to expand before iterating over the index entries. This is critical to do in advance because of how the original_cache_nr is tracked to allow inserting and replacing cache entries. Iterate over the conflicted files and check if any paths are outside of the sparse-checkout cone. If so, then expand the full index. Add a test that demonstrates that we do not expand the index, even when we hit a conflict within the sparse-checkout cone.
If I had read ahead a little bit instead of responding as I went.... :-) Awesome to see this.
quoted hunk ↗ jump to hunk
Signed-off-by: Derrick Stolee <redacted> --- merge-ort.c | 14 ++++++++--- t/t1092-sparse-checkout-compatibility.sh | 30 ++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 5 deletions(-)diff --git a/merge-ort.c b/merge-ort.c index 8e754b769e1..590e52058cf 100644 --- a/merge-ort.c +++ b/merge-ort.c@@ -36,6 +36,7 @@ #include "tree.h" #include "unpack-trees.h" #include "xdiff-interface.h" +#include "dir.h"
dir.h was already included from merge-ort.c; no need to include it again. (Plus, the original line keeps the nice ordering of the include list...)
quoted hunk ↗ jump to hunk
/* * We have many arrays of size 3. Whenever we have such an array, the@@ -4060,11 +4061,18 @@ static int record_conflicted_index_entries(struct merge_options *opt) /* * We are in a conflicted state. These conflicts might be inside - * sparse-directory entries, so expand the index preemtively. - * Also, we set original_cache_nr below, but that might change if + * sparse-directory entries, so check if any entries are outside + * of the sparse-checkout cone preemptively. + * + * We set original_cache_nr below, but that might change if * index_name_pos() calls ask for paths within sparse directories. */ - ensure_full_index(index); + strmap_for_each_entry(&opt->priv->conflicted, &iter, e) { + if (!path_in_sparse_checkout(e->key, index)) { + ensure_full_index(index); + break; + } + }
Sweet, awesome that it was so simple to implement.
quoted hunk ↗ jump to hunk
/* If any entries have skip_worktree set, we'll have to check 'em out */ state.force = 1;diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 781ebd9a656..a0ed2bec574 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh@@ -622,8 +622,21 @@ test_expect_success 'sparse-index is expanded and converted back' ' ensure_not_expanded () { rm -f trace2.txt && echo >>sparse-index/untracked.txt && - GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \ - git -C sparse-index "$@" && + + if test "$1" = "!" + then + shift && + ( + GIT_TRACE2_EVENT="$(pwd)/trace2.txt" && + GIT_TRACE2_EVENT_NESTING=10 && + export GIT_TRACE2_EVENT && + export GIT_TRACE2_EVENT_NESTING && + test_must_fail git -C sparse-index "$@" || return 1 + )
Could this be simplified to
test_must_fail env \
GIT_TRACE2_EVENT="$(pwd)/trace2.txt"
GIT_TRACE2_EVENT_NESTING=10 \
git -C sparse-index "$@" || return 1
?
Especially if the lines can be indented to make it clear that the only
difference between this block and the one below is the "test_must_fail
env" being added at the front.
quoted hunk ↗ jump to hunk
+ else + GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \ + git -C sparse-index "$@" || return 1 + fi && test_region ! index ensure_full_index trace2.txt }@@ -659,6 +672,19 @@ test_expect_success 'sparse-index is not expanded' ' ensure_not_expanded merge -s ort -m merge update-folder2 ' +test_expect_success 'sparse-index is not expanded: merge conflict in cone' ' + init_repos && + + for side in right left + do + git -C sparse-index checkout -b expand-$side base && + echo $side >sparse-index/deep/a && + git -C sparse-index commit -a -m "$side" || return 1 + done && + + ensure_not_expanded ! merge -m merged expand-right +' + # NEEDSWORK: a sparse-checkout behaves differently from a full checkout # in this scenario, but it shouldn't. test_expect_success 'reset mixed and checkout orphan' ' --gitgitgadget