undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries

Browse Source 
When merge conflicts occur in paths removed by a sparse-checkout, we
need to unsparsify those paths (clear the SKIP_WORKTREE bit), and write
out the conflicted file to the working copy.  In the very unlikely case
that someone manually put a file into the working copy at the location
of the SKIP_WORKTREE file, we need to avoid overwriting whatever edits
they have made and move that file to a different location first.

Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2021-03-20 00:03:50 +00:00 committed by Junio C Hamano
parent 8ddc20b896
commit 66b209b86a
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
merge-ort.c
View File

@ -3369,23 +3369,27 @@ static int checkout(struct merge_options *opt,
return ret; return ret;
} }
static int record_conflicted_index_entries(struct merge_options *opt, static int record_conflicted_index_entries(struct merge_options *opt)
struct index_state *index,
struct strmap *paths,
struct strmap *conflicted)
{ {
struct hashmap_iter iter; struct hashmap_iter iter;
struct strmap_entry *e; struct strmap_entry *e;
struct index_state *index = opt->repo->index;
struct checkout state = CHECKOUT_INIT;
int errs = 0; int errs = 0;
int original_cache_nr; int original_cache_nr;
if (strmap_empty(conflicted)) if (strmap_empty(&opt->priv->conflicted))
return 0; return 0;
/* If any entries have skip_worktree set, we'll have to check 'em out */
state.force = 1;
state.quiet = 1;
state.refresh_cache = 1;
state.istate = index;
original_cache_nr = index->cache_nr; original_cache_nr = index->cache_nr;
/* Put every entry from paths into plist, then sort */ /* Put every entry from paths into plist, then sort */
strmap_for_each_entry(conflicted, &iter, e) { strmap_for_each_entry(&opt->priv->conflicted, &iter, e) {
const char *path = e->key; const char *path = e->key;
struct conflict_info *ci = e->value; struct conflict_info *ci = e->value;
int pos; int pos;
@ -3426,9 +3430,23 @@ static int record_conflicted_index_entries(struct merge_options *opt,
* the higher order stages. Thus, we need override * the higher order stages. Thus, we need override
* the CE_SKIP_WORKTREE bit and manually write those * the CE_SKIP_WORKTREE bit and manually write those
* files to the working disk here. * files to the working disk here.
*
* TODO: Implement this CE_SKIP_WORKTREE fixup.
*/ */
if (ce_skip_worktree(ce)) {
struct stat st;
if (!lstat(path, &st)) {
char *new_name = unique_path(&opt->priv->paths,
path,
"cruft");
path_msg(opt, path, 1,
_("Note: %s not up to date and in way of checking out conflicted version; old copy renamed to %s"),
path, new_name);
errs |= rename(path, new_name);
free(new_name);
}
errs |= checkout_entry(ce, &state, NULL, NULL);
}
/* /*
* Mark this cache entry for removal and instead add * Mark this cache entry for removal and instead add
@ -3478,8 +3496,6 @@ void merge_switch_to_result(struct merge_options *opt,
{ {
assert(opt->priv == NULL); assert(opt->priv == NULL);
if (result->clean >= 0 && update_worktree_and_index) { if (result->clean >= 0 && update_worktree_and_index) {
struct merge_options_internal *opti = result->priv;
trace2_region_enter("merge", "checkout", opt->repo); trace2_region_enter("merge", "checkout", opt->repo);
if (checkout(opt, head, result->tree)) { if (checkout(opt, head, result->tree)) {
/* failure to function */ /* failure to function */
@ -3489,13 +3505,14 @@ void merge_switch_to_result(struct merge_options *opt,
trace2_region_leave("merge", "checkout", opt->repo); trace2_region_leave("merge", "checkout", opt->repo);
trace2_region_enter("merge", "record_conflicted", opt->repo); trace2_region_enter("merge", "record_conflicted", opt->repo);
if (record_conflicted_index_entries(opt, opt->repo->index, opt->priv = result->priv;
&opti->paths, if (record_conflicted_index_entries(opt)) {
&opti->conflicted)) {
/* failure to function */ /* failure to function */
opt->priv = NULL;
result->clean = -1; result->clean = -1;
return; return;
} }
opt->priv = NULL;
trace2_region_leave("merge", "record_conflicted", opt->repo); trace2_region_leave("merge", "record_conflicted", opt->repo);
} }

4
t/t6428-merge-conflicts-sparse.sh
View File

@ -76,7 +76,7 @@ test_setup_numerals () {
) )
} }
test_expect_merge_algorithm success failure 'conflicting entries written to worktree even if sparse' ' test_expect_success 'conflicting entries written to worktree even if sparse' '
test_setup_numerals plain && test_setup_numerals plain &&
( (
cd numerals_plain && cd numerals_plain &&
@ -112,7 +112,7 @@ test_expect_merge_algorithm success failure 'conflicting entries written to work
) )
' '
test_expect_merge_algorithm failure failure 'present-despite-SKIP_WORKTREE handled reasonably' ' test_expect_merge_algorithm failure success 'present-despite-SKIP_WORKTREE handled reasonably' '
test_setup_numerals in_the_way && test_setup_numerals in_the_way &&
( (
cd numerals_in_the_way && cd numerals_in_the_way &&