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

feature<Dashboard>: auto remove .git/rebase-apply when continue finished

Browse source
This commit is contained in:
leo 2020-11-17 19:56:18 +08:00
parent 78614a71db
commit 551021520a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -236,8 +236,6 @@ namespace SourceGit.UI {
MakeBranchNode(b, remote.Children, folders, states, "remotes"); MakeBranchNode(b, remote.Children, folders, states, "remotes");
} else { } else {
/// 对于 SUBMODULE HEAD 出于游离状态（detached on commit id）
/// 此时，分支既不是 本地分支，也不是远程分支
isDetached = b.IsCurrent; isDetached = b.IsCurrent;
} }
} }
@ -418,6 +416,7 @@ namespace SourceGit.UI {
} else { } else {
var cherryPickMerge = Path.Combine(repo.GitDir, "CHERRY_PICK_HEAD"); var cherryPickMerge = Path.Combine(repo.GitDir, "CHERRY_PICK_HEAD");
var rebaseMerge = Path.Combine(repo.GitDir, "REBASE_HEAD"); var rebaseMerge = Path.Combine(repo.GitDir, "REBASE_HEAD");
var rebaseApply = Path.Combine(repo.GitDir, "rebase-apply");
var revertMerge = Path.Combine(repo.GitDir, "REVERT_HEAD"); var revertMerge = Path.Combine(repo.GitDir, "REVERT_HEAD");
var otherMerge = Path.Combine(repo.GitDir, "MERGE_HEAD"); var otherMerge = Path.Combine(repo.GitDir, "MERGE_HEAD");
@ -429,6 +428,8 @@ namespace SourceGit.UI {
File.Delete(revertMerge); File.Delete(revertMerge);
} else if (File.Exists(otherMerge)) { } else if (File.Exists(otherMerge)) {
File.Delete(otherMerge); File.Delete(otherMerge);
} else if (Directory.Exists(rebaseApply)) {
Directory.Delete(rebaseApply);
} }
repo.Branches(true); repo.Branches(true);