Skip to content

Commit 4a8ad68

Browse files
committed
Make context menu items work with remote branch
1 parent 1ec4f02 commit 4a8ad68

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Classes/Controllers/PBGitHistoryController.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ - (IBAction)pushToRemote:(id)sender
716716

717717
- (IBAction)merge:(id)sender
718718
{
719-
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXCommitType, kGitXTagType]];
719+
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXRemoteBranchType, kGitXCommitType, kGitXTagType]];
720720
if (!refish) return;
721721

722722
NSError *error = nil;
@@ -728,8 +728,8 @@ - (IBAction)merge:(id)sender
728728

729729
- (IBAction)checkout:(id)sender
730730
{
731-
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXCommitType, kGitXTagType]];
732-
if (!selectedCommits) return;
731+
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXRemoteBranchType, kGitXCommitType, kGitXTagType]];
732+
if (!refish) return;
733733

734734
NSError *error = nil;
735735
BOOL success = [repository checkoutRefish:refish error:&error];
@@ -752,7 +752,7 @@ - (IBAction)cherryPick:(id)sender
752752

753753
- (IBAction)rebase:(id)sender
754754
{
755-
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
755+
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXRemoteBranchType]];
756756
if (!refish) return;
757757

758758
NSError *error = nil;
@@ -764,7 +764,7 @@ - (IBAction)rebase:(id)sender
764764

765765
- (IBAction) rebaseHeadBranch:(id)sender
766766
{
767-
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType]];
767+
id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXRemoteBranchType]];
768768
NSError *error = nil;
769769
BOOL success = [self.repository rebaseBranch:nil onRefish:refish error:&error];
770770
if (!success) {

0 commit comments

Comments
 (0)