From 5fa2c601a86333febafc3c67bf0cfbd08fe5b66b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 7 Aug 2020 17:02:43 +0800
Subject: [PATCH] fix(Pull): make sure `git pull` succeeds before dropping
 stash

---
 src/Git/Repository.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Git/Repository.cs b/src/Git/Repository.cs
index 8771ec32..a5d8f8a9 100644
--- a/src/Git/Repository.cs
+++ b/src/Git/Repository.cs
@@ -516,10 +516,8 @@ namespace SourceGit.Git {
             }, true);
 
             OnSubmoduleChanged?.Invoke();
-
             AssertCommand(errs);
-
-            if (needPopStash) RunCommand("stash pop -q stash@{0}", null);
+            if (needPopStash && errs == null) RunCommand("stash pop -q stash@{0}", null);
         }
 
         /// <summary>