gitui-org/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui.git synced 2026-10-12 02:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 624 pull offline (#625)

Browse Source 
* fix pull being blocked if it fails
* update changelog
This commit is contained in:
Stephan Dilly
2021-04-07 10:57:03 +02:00
committed by GitHub
parent e65218db01
commit 0a608ae65e
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -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
+3
View File
@@ -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{}",