diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-16 20:53:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-16 20:53:34 (GMT) |
| commit | 7bec8e7fa6175f51e79c55e28e6b2a547a986926 (patch) | |
| tree | 771cfbec9a53d9cd46f6dabf1613d012cf619fd2 /builtin/rebase.c | |
| parent | e2e1a03f6b9c0869e64710c94fc43df82a06f0c8 (diff) | |
| parent | f3b964a07ef70eee6bacefd1ed5f94eb871be902 (diff) | |
| download | git-7bec8e7fa6175f51e79c55e28e6b2a547a986926.zip git-7bec8e7fa6175f51e79c55e28e6b2a547a986926.tar.gz git-7bec8e7fa6175f51e79c55e28e6b2a547a986926.tar.bz2 | |
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
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 783b526..ed1da17 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -738,6 +738,7 @@ static int finish_rebase(struct rebase_options *opts) int ret = 0; delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF); + unlink(git_path_auto_merge(the_repository)); apply_autostash(state_dir_path("autostash", opts)); close_object_store(the_repository->objects); /* |