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

fix: for init-commit, app will crash with COMMIT & PUSH due to local branch has not been updated (#1229)

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-04-22 18:45:14 +08:00
parent f2000b4a84
commit 87ebe3741d
No known key found for this signature in database
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ViewModels/Push.cs
View file

@ -114,6 +114,9 @@ namespace SourceGit.ViewModels
// Set default selected local branch. // Set default selected local branch.
if (localBranch != null) if (localBranch != null)
{ {
if (LocalBranches.Count == 0)
LocalBranches.Add(localBranch);
_selectedLocalBranch = localBranch; _selectedLocalBranch = localBranch;
HasSpecifiedLocalBranch = true; HasSpecifiedLocalBranch = true;
} }

11
src/ViewModels/WorkingCopy.cs
View file

@ -1733,8 +1733,19 @@ namespace SourceGit.ViewModels
UseAmend = false; UseAmend = false;
if (autoPush && _repo.Remotes.Count > 0) if (autoPush && _repo.Remotes.Count > 0)
{
if (_repo.CurrentBranch == null)
{
var currentBranchName = Commands.Branch.ShowCurrent(_repo.FullPath);
var tmp = new Models.Branch() { Name = currentBranchName };
_repo.ShowAndStartPopup(new Push(_repo, tmp));
}
else
{
_repo.ShowAndStartPopup(new Push(_repo, null)); _repo.ShowAndStartPopup(new Push(_repo, null));
} }
}
}
_repo.MarkBranchesDirtyManually(); _repo.MarkBranchesDirtyManually();
_repo.SetWatcherEnabled(true); _repo.SetWatcherEnabled(true);