diff --git a/SourceGit/Git/Remote.cs b/SourceGit/Git/Remote.cs index 1d1ade87..ed32e810 100644 --- a/SourceGit/Git/Remote.cs +++ b/SourceGit/Git/Remote.cs @@ -57,7 +57,7 @@ namespace SourceGit.Git { if (errs != null) { App.RaiseError(errs); } else { - repo.Fetch(new Remote() { Name = name }, "--recurse-submodules=on-demand", true, null); + repo.Fetch(new Remote() { Name = name }, true, null); } } diff --git a/SourceGit/Git/Repository.cs b/SourceGit/Git/Repository.cs index a50bbfb7..087ed5f4 100644 --- a/SourceGit/Git/Repository.cs +++ b/SourceGit/Git/Repository.cs @@ -455,13 +455,12 @@ namespace SourceGit.Git { /// Fetch remote changes /// /// - /// submod /// /// - public void Fetch(Remote remote, string submod, bool prune, Action onProgress) { + public void Fetch(Remote remote, bool prune, Action onProgress) { isWatcherDisabled = true; - var args = $"-c credential.helper=manager fetch --progress --verbose {submod} "; + var args = "-c credential.helper=manager fetch --progress --verbose "; if (prune) args += "--prune "; @@ -485,15 +484,14 @@ namespace SourceGit.Git { /// /// remote /// branch - /// submod /// Progress message handler. /// Use rebase instead of merge. /// Auto stash local changes. /// Progress message handler. - public void Pull(string remote, string branch, string submod, Action onProgress, bool rebase = false, bool autostash = false) { + public void Pull(string remote, string branch, Action onProgress, bool rebase = false, bool autostash = false) { isWatcherDisabled = true; - var args = $"-c credential.helper=manager pull --verbose --progress {submod} "; + var args = "-c credential.helper=manager pull --verbose --progress "; var needPopStash = false; if (rebase) args += "--rebase "; @@ -531,15 +529,14 @@ namespace SourceGit.Git { /// Remote /// Local branch name /// Remote branch name - /// submod /// Progress message handler. /// Push tags /// Create track reference /// Force push - public void Push(string remote, string localBranch, string remoteBranch, string submod, Action onProgress, bool withTags = false, bool track = false, bool force = false) { + public void Push(string remote, string localBranch, string remoteBranch, Action onProgress, bool withTags = false, bool track = false, bool force = false) { isWatcherDisabled = true; - var args = $"-c credential.helper=manager push --progress --verbose {submod} "; + var args = "-c credential.helper=manager push --progress --verbose "; if (withTags) args += "--tags "; if (track) args += "-u "; diff --git a/SourceGit/SourceGit.csproj b/SourceGit/SourceGit.csproj index dbb64ca1..83255225 100644 --- a/SourceGit/SourceGit.csproj +++ b/SourceGit/SourceGit.csproj @@ -9,7 +9,7 @@ OpenSource GIT client for Windows Copyright © sourcegit 2020. All rights reserved. App.manifest - 1.4 + 2.0.0-preview MIT diff --git a/SourceGit/UI/Fetch.xaml b/SourceGit/UI/Fetch.xaml index 11e59594..550ed554 100644 --- a/SourceGit/UI/Fetch.xaml +++ b/SourceGit/UI/Fetch.xaml @@ -6,7 +6,7 @@ xmlns:git="clr-namespace:SourceGit.Git" xmlns:converters="clr-namespace:SourceGit.Converters" mc:Ignorable="d" - d:DesignHeight="192" d:DesignWidth="500" Height="224" Width="500"> + d:DesignHeight="192" d:DesignWidth="500" Height="192" Width="500"> @@ -14,7 +14,6 @@ - @@ -42,24 +41,17 @@ -