File tree Expand file tree Collapse file tree 2 files changed +3
-1
lines changed Expand file tree Collapse file tree 2 files changed +3
-1
lines changed Original file line number Diff line number Diff line change @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
16
16
- added scrollbar to revlog [[ @ashvin021 ] ( https://github.com/ashvin021 )] ([ #868 ] ( https://github.com/extrawurst/gitui/issues/868 ) )
17
17
18
18
## Fixed
19
+ - fix merging branch not closing branch window [[ @andrewpollack ] ( https://github.com/andrewpollack )] ([ #876 ] ( https://github.com/extrawurst/gitui/issues/876 ) )
19
20
- fix commit msg being broken inside tag list ([ #871 ] ( https://github.com/extrawurst/gitui/issues/871 ) )
20
21
- fix filetree file content not showing tabs correctly ([ #874 ] ( https://github.com/extrawurst/gitui/issues/874 ) )
21
22
Original file line number Diff line number Diff line change @@ -362,12 +362,13 @@ impl BranchListComponent {
362
362
!self . branches . is_empty ( )
363
363
}
364
364
365
- fn merge_branch ( & self ) -> Result < ( ) > {
365
+ fn merge_branch ( & mut self ) -> Result < ( ) > {
366
366
if let Some ( branch) =
367
367
self . branches . get ( usize:: from ( self . selection ) )
368
368
{
369
369
sync:: merge_branch ( CWD , & branch. name ) ?;
370
370
371
+ self . hide ( ) ;
371
372
self . queue . push ( InternalEvent :: Update ( NeedsUpdate :: ALL ) ) ;
372
373
}
373
374
You can’t perform that action at this time.
0 commit comments