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

fix: wrong display when merge tag

Browse source 
* remove `Text.Merge.Source`  translations from `de_DE`/`es_ES`/`fr_FR`/`it_IT`/`pt_BR`/`ru_RU` because its content has been changed
This commit is contained in:
leo 2024-12-10 15:35:46 +08:00
parent 4dd3b7f412
commit 2504a52398
No known key found for this signature in database
13 changed files with 55 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/ViewModels/Repository.cs
View file

@ -1311,8 +1311,13 @@ namespace SourceGit.ViewModels
fastForward.IsEnabled = branch.TrackStatus.Ahead.Count == 0;
fastForward.Click += (_, e) =>
{
var b = _branches.Find(x => x.FriendlyName == upstream);
if (b == null)
return;
if (PopupHost.CanCreatePopup())
PopupHost.ShowAndStartPopup(new Merge(this, upstream, branch.Name));
PopupHost.ShowAndStartPopup(new Merge(this, b, branch.Name));
e.Handled = true;
};
@ -1391,7 +1396,7 @@ namespace SourceGit.ViewModels
merge.Click += (_, e) =>
{
if (PopupHost.CanCreatePopup())
PopupHost.ShowPopup(new Merge(this, branch.Name, _currentBranch.Name));
PopupHost.ShowPopup(new Merge(this, branch, _currentBranch.Name));
e.Handled = true;
};
@ -1687,7 +1692,7 @@ namespace SourceGit.ViewModels
merge.Click += (_, e) =>
{
if (PopupHost.CanCreatePopup())
PopupHost.ShowPopup(new Merge(this, name, _currentBranch.Name));
PopupHost.ShowPopup(new Merge(this, branch, _currentBranch.Name));
e.Handled = true;
};