From 35f20cddd596523a235bf3ae18f8e01dfdb3250f Mon Sep 17 00:00:00 2001 From: Mark Bestley Date: Mon, 1 Dec 2008 13:59:05 +0100 Subject: [PATCH] GitRefController: Fix moving and updating branches This was also broken with the libgit2 move --- PBRefController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PBRefController.m b/PBRefController.m index 3b43c28..8dfd092 100644 --- a/PBRefController.m +++ b/PBRefController.m @@ -138,7 +138,7 @@ return NO; int retValue = 1; - [historyController.repository outputForArguments:[NSArray arrayWithObjects:@"update-ref", @"-mUpdate from GitX", [ref ref], [dropCommit sha], NULL] retValue:&retValue]; + [historyController.repository outputForArguments:[NSArray arrayWithObjects:@"update-ref", @"-mUpdate from GitX", [ref ref], [dropCommit realSha], NULL] retValue:&retValue]; if (retValue) return NO; @@ -170,7 +170,7 @@ PBGitCommit *commit = [[commitController selectedObjects] objectAtIndex:0]; int retValue = 1; - [historyController.repository outputForArguments:[NSArray arrayWithObjects:@"update-ref", @"-mCreate branch from GitX", branchName, [commit sha], NULL] retValue:&retValue]; + [historyController.repository outputForArguments:[NSArray arrayWithObjects:@"update-ref", @"-mCreate branch from GitX", branchName, [commit realSha], NULL] retValue:&retValue]; if (retValue) { NSLog(@"Creating ref failed!");