dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-22 20:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

enhance: only write MERGE_MSG when commit message is not null

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-03-01 09:21:52 +08:00
parent 5199fb2b74
commit 8dd0274bdd
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ViewModels/WorkingCopy.cs
View file

@ -446,7 +446,7 @@ namespace SourceGit.ViewModels
Task.Run(() => Task.Run(() =>
{ {
var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG"); var mergeMsgFile = Path.Combine(_repo.GitDir, "MERGE_MSG");
if (File.Exists(mergeMsgFile)) if (File.Exists(mergeMsgFile) && !string.IsNullOrWhiteSpace(_commitMessage))
File.WriteAllText(mergeMsgFile, _commitMessage); File.WriteAllText(mergeMsgFile, _commitMessage);
var succ = _inProgressContext.Continue(); var succ = _inProgressContext.Continue();
@ -729,8 +729,8 @@ namespace SourceGit.ViewModels
byParentFolder.IsVisible = !isRooted; byParentFolder.IsVisible = !isRooted;
byParentFolder.Click += (_, e) => byParentFolder.Click += (_, e) =>
{ {
var path = Path.GetDirectoryName(change.Path).Replace("\\", "/"); var dir = Path.GetDirectoryName(change.Path).Replace("\\", "/");
Commands.GitIgnore.Add(_repo.FullPath, path + "/"); Commands.GitIgnore.Add(_repo.FullPath, dir + "/");
e.Handled = true; e.Handled = true;
}; };
addToIgnore.Items.Add(byParentFolder); addToIgnore.Items.Add(byParentFolder);
@ -751,8 +751,8 @@ namespace SourceGit.ViewModels
byExtensionInSameFolder.IsVisible = !isRooted; byExtensionInSameFolder.IsVisible = !isRooted;
byExtensionInSameFolder.Click += (_, e) => byExtensionInSameFolder.Click += (_, e) =>
{ {
var path = Path.GetDirectoryName(change.Path).Replace("\\", "/"); var dir = Path.GetDirectoryName(change.Path).Replace("\\", "/");
Commands.GitIgnore.Add(_repo.FullPath, path + "/*" + extension); Commands.GitIgnore.Add(_repo.FullPath, dir + "/*" + extension);
e.Handled = true; e.Handled = true;
}; };
addToIgnore.Items.Add(byExtensionInSameFolder); addToIgnore.Items.Add(byExtensionInSameFolder);