github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-23 10:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: auto-update submodules after merging (#1804)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2025-11-27 14:29:09 +08:00
parent d05edea61a
commit 440c97b595
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ViewModels/Merge.cs
View File

@@ -65,13 +65,22 @@ namespace SourceGit.ViewModels
var log = _repo.CreateLog($"Merging '{_sourceName}' into '{Into}'");
Use(log);
await new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg, Edit)
var succ = await new Commands.Merge(_repo.FullPath, _sourceName, Mode.Arg, Edit)
.Use(log)
.ExecAsync();
if (succ)
{
var submodules = await new Commands.QueryUpdatableSubmodules(_repo.FullPath).GetResultAsync();
if (submodules.Count > 0)
await new Commands.Submodule(_repo.FullPath)
.Use(log)
.UpdateAsync(submodules, true, true);
}
log.Complete();
if (_repo.SelectedViewIndex == 0)
if (succ && _repo.SelectedViewIndex == 0)
{
var head = await new Commands.QueryRevisionByRefName(_repo.FullPath, "HEAD").GetResultAsync();
_repo.NavigateToCommit(head, true);