Rewire rebase

Author: tiennou

Classes/Controllers/PBGitWindowController.m

@@ -647,7 +647,7 @@ - (IBAction)merge:(id)sender
 
 - (IBAction)rebase:(id)sender
 {
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXRemoteBranchType]];
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXCommitType]];
 	if (!refish) return;
 
 	NSError *error = nil;
@@ -659,7 +659,10 @@ - (IBAction)rebase:(id)sender
 
 - (IBAction)rebaseHeadBranch:(id)sender
 {
-	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXBranchType, kGitXRemoteBranchType]];
+	id <PBGitRefish> refish = [self refishForSender:sender refishTypes:@[kGitXCommitType]];
+	if (!refish || ![refish isKindOfClass:[PBGitCommit class]])
+		return;
+
 	NSError *error = nil;
 	BOOL success = [self.repository rebaseBranch:nil onRefish:refish error:&error];
 	if (!success) {

Classes/git/PBGitRepository.m

@@ -893,8 +893,7 @@ - (BOOL) cherryPickRefish:(id <PBGitRefish>)ref error:(NSError **)error
 
 - (BOOL) rebaseBranch:(id <PBGitRefish>)branch onRefish:(id <PBGitRefish>)upstream error:(NSError **)error
 {
-	if (!upstream)
-		return NO;
+	NSParameterAssert(upstream != nil);
 
 	NSArray *arguments = @[@"rebase", upstream.refishName];