michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-23 20:47:25 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(Merge): auto delete MERGE_HEAD/REVERT_HEAD/REBASE_HEAD/CHERRY_PICK_HEAD when merge command returns no errors.

Browse source
This commit is contained in:
leo 2020-08-18 09:40:21 +08:00
parent 42c933ab54
commit 96bf5548c6
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/UI/Dashboard.xaml.cs
View file

@ -413,7 +413,32 @@ namespace SourceGit.UI {
await Task.Run(() => {
repo.SetWatcherEnabled(false);
var errs = repo.RunCommand($"-c core.editor=true {abortCommand} --continue", null);
repo.AssertCommand(errs);
if (errs != null) {
App.RaiseError(errs);
} else {
var cherryPickMerge = Path.Combine(repo.GitDir, "CHERRY_PICK_HEAD");
var rebaseMerge = Path.Combine(repo.GitDir, "REBASE_HEAD");
var revertMerge = Path.Combine(repo.GitDir, "REVERT_HEAD");
var otherMerge = Path.Combine(repo.GitDir, "MERGE_HEAD");
if (File.Exists(cherryPickMerge)) {
File.Delete(cherryPickMerge);
} else if (File.Exists(rebaseMerge)) {
File.Delete(rebaseMerge);
} else if (File.Exists(revertMerge)) {
File.Delete(revertMerge);
} else if (File.Exists(otherMerge)) {
File.Delete(otherMerge);
}
repo.Branches(true);
UpdateBranches();
UpdateHistories();
UpdateLocalChanges();
UpdateTags();
}
repo.SetWatcherEnabled(true);
});
commits.ClearMessage();