File tree Expand file tree Collapse file tree 2 files changed +16
-3
lines changed Expand file tree Collapse file tree 2 files changed +16
-3
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,6 @@ public class RenameBranch : Popup
8
8
public Models . Branch Target
9
9
{
10
10
get ;
11
- private set ;
12
11
}
13
12
14
13
[ Required ( ErrorMessage = "Branch name is required!!!" ) ]
@@ -54,8 +53,19 @@ public override Task<bool> Sure()
54
53
55
54
return Task . Run ( ( ) =>
56
55
{
56
+ var oldName = Target . FullName ;
57
57
var succ = Commands . Branch . Rename ( _repo . FullPath , Target . Name , _name ) ;
58
- CallUIThread ( ( ) => _repo . SetWatcherEnabled ( true ) ) ;
58
+ CallUIThread ( ( ) =>
59
+ {
60
+ if ( succ && _repo . Settings . Filters . Contains ( oldName ) )
61
+ {
62
+ _repo . Settings . Filters . Remove ( oldName ) ;
63
+ _repo . Settings . Filters . Add ( $ "refs/heads/{ _name } ") ;
64
+ }
65
+
66
+ _repo . MarkBranchesDirtyManually ( ) ;
67
+ _repo . SetWatcherEnabled ( true ) ;
68
+ } ) ;
59
69
return succ ;
60
70
} ) ;
61
71
}
Original file line number Diff line number Diff line change @@ -841,7 +841,7 @@ public void RefreshCommits()
841
841
842
842
if ( _settings . Filters . Count != validFilters . Count )
843
843
{
844
- Dispatcher . UIThread . Post ( ( ) =>
844
+ Dispatcher . UIThread . Invoke ( ( ) =>
845
845
{
846
846
_settings . Filters . Clear ( ) ;
847
847
_settings . Filters . AddRange ( validFilters ) ;
@@ -850,6 +850,9 @@ public void RefreshCommits()
850
850
}
851
851
else
852
852
{
853
+ if ( _settings . Filters . Count != 0 )
854
+ Dispatcher . UIThread . Invoke ( ( ) => _settings . Filters . Clear ( ) ) ;
855
+
853
856
limits += "--exclude=refs/stash --all" ;
854
857
}
855
858
You can’t perform that action at this time.
0 commit comments