Fix 624 pull offline (#625)

* fix pull being blocked if it fails
* update changelog

Author: Stephan Dilly

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - push branch to its tracking remote ([#597](https://github.com/extrawurst/gitui/issues/597))
 - fixed panic when staging lines involving missing newline eof ([#605](https://github.com/extrawurst/gitui/issues/605))
+- fixed pull/fetch deadlocking when it fails ([#624](https://github.com/extrawurst/gitui/issues/624))
 
 ## [0.13.0] - 2020-03-15 - Happy Birthday GitUI 🥳
 

src/components/pull.rs

@@ -99,6 +99,7 @@ impl PullComponent {
             branch: self.branch.clone(),
             basic_credential: cred,
         })?;
+
         Ok(())
     }
 
@@ -133,6 +134,8 @@ impl PullComponent {
                 if err.is_empty() {
                     self.try_ff_merge()?;
                 } else {
+                    self.pending = false;
+                    self.hide();
                     self.queue.borrow_mut().push_back(
                         InternalEvent::ShowErrorMsg(format!(
                             "fetch failed:\n{}",