michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-10-31 13:03:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(Pull): make sure git pull succeeds before dropping stash

Browse source
This commit is contained in:
leo 2020-08-07 17:02:43 +08:00
parent 861ed8bdb6
commit 5fa2c601a8
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Git/Repository.cs
View file

@ -516,10 +516,8 @@ namespace SourceGit.Git {
}, true); }, true);
OnSubmoduleChanged?.Invoke(); OnSubmoduleChanged?.Invoke();
AssertCommand(errs); AssertCommand(errs);
if (needPopStash && errs == null) RunCommand("stash pop -q stash@{0}", null);
if (needPopStash) RunCommand("stash pop -q stash@{0}", null);
} }
/// <summary> /// <summary>