Skip to content

Commit 7bec8e7

Browse files
gitstergitster
committed
Merge branch 'en/ort-readiness'
Plug the ort merge backend throughout the rest of the system, and start testing it as a replacement for the recursive backend. * en/ort-readiness: Add testing with merge-ort merge strategy t6423: mark remaining expected failure under merge-ort as such Revert "merge-ort: ignore the directory rename split conflict for now" merge-recursive: add a bunch of FIXME comments documenting known bugs merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict t: mark several submodule merging tests as fixed under merge-ort merge-ort: implement CE_SKIP_WORKTREE handling with conflicted entries t6428: new test for SKIP_WORKTREE handling and conflicts merge-ort: support subtree shifting merge-ort: let renormalization change modify/delete into clean delete merge-ort: have ll_merge() use a special attr_index for renormalization merge-ort: add a special minimal index just for renormalization merge-ort: use STABLE_QSORT instead of QSORT where required
2 parents e2e1a03 + f3b964a commit 7bec8e7

16 files changed

+446
-38
lines changed

‎branch.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ void remove_merge_branch_state(struct repository *r)
344344
unlink(git_path_merge_rr(r));
345345
unlink(git_path_merge_msg(r));
346346
unlink(git_path_merge_mode(r));
347+
unlink(git_path_auto_merge(r));
347348
save_autostash(git_path_merge_autostash(r));
348349
}
349350

‎builtin/rebase.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,7 @@ static int finish_rebase(struct rebase_options *opts)
738738
int ret = 0;
739739

740740
delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
741+
unlink(git_path_auto_merge(the_repository));
741742
apply_autostash(state_dir_path("autostash", opts));
742743
close_object_store(the_repository->objects);
743744
/*

‎ci/run-build-and-tests.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ linux-gcc)
1616
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
1717
make test
1818
export GIT_TEST_SPLIT_INDEX=yes
19+
export GIT_TEST_MERGE_ALGORITHM=recursive
1920
export GIT_TEST_FULL_IN_PACK_ARRAY=true
2021
export GIT_TEST_OE_SIZE=10
2122
export GIT_TEST_OE_DELTA_SIZE=5

0 commit comments

Comments
 (0)