Skip to content

Fix 624 pull offline #625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 7, 2021
Merged

Fix 624 pull offline #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7168ab4
fix pull being blocked if it fails
Apr 7, 2021
53c262e
update changelog
Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 🥳

Expand Down
3 changes: 3 additions & 0 deletions src/components/pull.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ impl PullComponent {
branch: self.branch.clone(),
basic_credential: cred,
})?;

Ok(())
}

Expand Down Expand Up @@ -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{}",
Expand Down