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

<fix>(*): 撤销了 commit ceff6ef102

Browse source
This commit is contained in:
ZCShou 2020-07-30 13:59:12 +08:00
parent a41c7a7b1c
commit 9ea9d18a4d
9 changed files with 25 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

16
SourceGit/UI/Push.xaml.cs
View file

@ -53,7 +53,7 @@ namespace SourceGit.UI {
var remoteBranch = upstream.Substring(remoteIdx + 1);
Task.Run(() => {
repo.Push(remote, current.Name, remoteBranch, "--recurse-submodules=no", PopupManager.UpdateStatus);
repo.Push(remote, current.Name, remoteBranch, PopupManager.UpdateStatus);
push.Dispatcher.Invoke(() => {
PopupManager.Close(true);
});
@ -90,18 +90,6 @@ namespace SourceGit.UI {
var track = string.IsNullOrEmpty(localBranch.Upstream);
var tags = chkTags.IsChecked == true;
var force = chkForce.IsChecked == true;
string subMod;
if (RbtnRrsSubModCheck.IsChecked == true) {
subMod = "--recurse-submodules=check";
} else if (RbtnRrsSubModDemand.IsChecked == true) {
subMod = "--recurse-submodules=on-demand";
}
else if (RbtnRrsSubModOnly.IsChecked == true) {
subMod = "--recurse-submodules=only";
} else{
subMod = "--recurse-submodules=no";
}
remoteBranch = remoteBranch.Substring($"{remote}/".Length);
if (remoteBranch.Contains(" (new)")) {
@ -109,7 +97,7 @@ namespace SourceGit.UI {
}
PopupManager.Lock();
await Task.Run(() => repo.Push(remote, localBranch.Name, remoteBranch, subMod, PopupManager.UpdateStatus, tags, track, force));
await Task.Run(() => repo.Push(remote, localBranch.Name, remoteBranch, PopupManager.UpdateStatus, tags, track, force));
PopupManager.Close(true);
}