@@ -664,7 +664,7 @@ - (NSArray *)menuItemsForPaths:(NSArray *)paths
664
664
- (IBAction )fetchRemote : (id )sender
665
665
{
666
666
id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType ]];
667
- if (!refish)
667
+ if (!refish || ![refish isKindOfClass: [PBGitRef class ]] )
668
668
return ;
669
669
670
670
[self .windowController performFetchForRef: refish];
@@ -673,7 +673,7 @@ - (IBAction)fetchRemote:(id)sender
673
673
- (IBAction )pullRemote : (id )sender
674
674
{
675
675
id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType ]];
676
- if (!refish)
676
+ if (!refish || ![refish isKindOfClass: [PBGitRef class ]] )
677
677
return ;
678
678
679
679
[self .windowController performPullForBranch: refish remote: nil rebase: NO ];
@@ -682,34 +682,33 @@ - (IBAction)pullRemote:(id)sender
682
682
- (IBAction )pushUpdatesToRemote : (id )sender
683
683
{
684
684
id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType ]];
685
- if (!refish)
685
+ if (!refish || ![refish isKindOfClass: [PBGitRef class ]] )
686
686
return ;
687
687
688
- PBGitRef *remoteRef = nil ; // [(PBGitRef *)sender.refishs.firstObject remoteRef];
688
+ PBGitRef *remoteRef = [(PBGitRef *)refish remoteRef ];
689
689
690
690
[self .windowController performPushForBranch: nil toRemote: remoteRef];
691
691
}
692
692
693
693
- (IBAction )pushDefaultRemoteForRef : (id )sender
694
694
{
695
695
id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType ]];
696
- if (!refish)
696
+ if (!refish || ![refish isKindOfClass: [PBGitRef class ]] )
697
697
return ;
698
698
699
- PBGitRef *ref = nil ;
699
+ PBGitRef *ref = (PBGitRef *)refish ;
700
700
701
701
[self .windowController performPushForBranch: ref toRemote: nil ];
702
702
}
703
703
704
704
- (IBAction )pushToRemote : (id )sender
705
705
{
706
706
id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType ]];
707
- if (!refish)
707
+ if (!refish || ![refish isKindOfClass: [PBGitRef class ]] )
708
708
return ;
709
709
710
- PBGitRef *ref = nil ;
711
- NSString *remoteName = [sender representedObject ];
712
- PBGitRef *remoteRef = [PBGitRef refFromString: [kGitXRemoteRefPrefix stringByAppendingString: remoteName]];
710
+ PBGitRef *ref = (PBGitRef *)refish;
711
+ PBGitRef *remoteRef = ref.remoteRef ;
713
712
714
713
[self .windowController performPushForBranch: ref toRemote: remoteRef];
715
714
}
@@ -762,7 +761,7 @@ - (IBAction)rebase:(id)sender
762
761
}
763
762
}
764
763
765
- - (IBAction ) rebaseHeadBranch : (id )sender
764
+ - (IBAction )rebaseHeadBranch : (id )sender
766
765
{
767
766
id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType , kGitXRemoteBranchType ]];
768
767
NSError *error = nil ;
@@ -772,10 +771,10 @@ - (IBAction) rebaseHeadBranch:(id)sender
772
771
}
773
772
}
774
773
775
- - (IBAction )showDeleteRefSheet : (PBRefMenuItem * )sender
774
+ - (IBAction )showDeleteRefSheet : (id )sender
776
775
{
777
776
id <PBGitRefish> refish = [self refishForSender: sender refishTypes: @[kGitXBranchType ]];
778
- if (!refish)
777
+ if (!refish || ![refish isKindOfClass: [PBGitRef class ]] )
779
778
return ;
780
779
781
780
PBGitRef *ref = (PBGitRef *)refish;
0 commit comments