Skip to content

Commit 3a1c1a6

Browse files
merge branch closes window (#882)
fixes #876
1 parent 361e1d8 commit 3a1c1a6

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
- added scrollbar to revlog [[@ashvin021](https://github.com/ashvin021)] ([#868](https://github.com/extrawurst/gitui/issues/868))
1717

1818
## Fixed
19+
- fix merging branch not closing branch window [[@andrewpollack](https://github.com/andrewpollack)] ([#876](https://github.com/extrawurst/gitui/issues/876))
1920
- fix commit msg being broken inside tag list ([#871](https://github.com/extrawurst/gitui/issues/871))
2021
- fix filetree file content not showing tabs correctly ([#874](https://github.com/extrawurst/gitui/issues/874))
2122

src/components/branchlist.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,12 +362,13 @@ impl BranchListComponent {
362362
!self.branches.is_empty()
363363
}
364364

365-
fn merge_branch(&self) -> Result<()> {
365+
fn merge_branch(&mut self) -> Result<()> {
366366
if let Some(branch) =
367367
self.branches.get(usize::from(self.selection))
368368
{
369369
sync::merge_branch(CWD, &branch.name)?;
370370

371+
self.hide();
371372
self.queue.push(InternalEvent::Update(NeedsUpdate::ALL));
372373
}
373374

0 commit comments

Comments
 (0)