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 2

fix<Remote>: do NOT validate remote's name when edit only remote's URL

Browse source
This commit is contained in:
leo 2021-06-16 20:02:05 +08:00
parent 8b538e7963
commit be8098ebe3
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Views/Popups/Remote.xaml.cs
View file

@ -31,8 +31,10 @@ namespace SourceGit.Views.Popups {
} }
public override Task<bool> Start() { public override Task<bool> Start() {
if (remote == null || remote.Name != RemoteName) {
txtName.GetBindingExpression(TextBox.TextProperty).UpdateSource(); txtName.GetBindingExpression(TextBox.TextProperty).UpdateSource();
if (Validation.GetHasError(txtName)) return null; if (Validation.GetHasError(txtName)) return null;
}
txtUrl.GetBindingExpression(TextBox.TextProperty).UpdateSource(); txtUrl.GetBindingExpression(TextBox.TextProperty).UpdateSource();
if (Validation.GetHasError(txtUrl)) return null; if (Validation.GetHasError(txtUrl)) return null;
@ -44,11 +46,13 @@ namespace SourceGit.Views.Popups {
if (succ) new Commands.Fetch(repo.Path, RemoteName, true, UpdateProgress).Exec(); if (succ) new Commands.Fetch(repo.Path, RemoteName, true, UpdateProgress).Exec();
} else { } else {
if (remote.URL != RemoteURL) { if (remote.URL != RemoteURL) {
new Commands.Remote(repo.Path).SetURL(remote.Name, RemoteURL); var succ = new Commands.Remote(repo.Path).SetURL(remote.Name, RemoteURL);
if (succ) remote.URL = RemoteURL;
} }
if (remote.Name != RemoteName) { if (remote.Name != RemoteName) {
new Commands.Remote(repo.Path).Rename(remote.Name, RemoteName); var succ = new Commands.Remote(repo.Path).Rename(remote.Name, RemoteName);
if (succ) remote.Name = RemoteName;
} }
} }
Models.Watcher.SetEnabled(repo.Path, true); Models.Watcher.SetEnabled(repo.Path, true);