From 0a608ae65e9c102b7b7bbf207cc5d941dd96858f Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Wed, 7 Apr 2021 10:57:03 +0200 Subject: [PATCH] Fix 624 pull offline (#625) * fix pull being blocked if it fails * update changelog --- CHANGELOG.md | 1 + src/components/pull.rs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8ee42e8..af483ae6 100644 --- a/CHANGELOG.md +++ b/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 🥳 diff --git a/src/components/pull.rs b/src/components/pull.rs index 458d3985..01f6ec86 100644 --- a/src/components/pull.rs +++ b/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{}",