Parse refs with ObjectiveGit

Author: nanotech

Classes/git/PBGitIndex.m

@@ -238,7 +238,7 @@ - (NSString *) parentTree
 {
 	NSString *parent = self.amend ? @"HEAD^" : @"HEAD";
 
-	if (![self.repository parseReference:parent])
+	if (![self.repository revisionExists:parent])
 		// We don't have a head ref. Return the empty tree.
 		return @"4b825dc642cb6eb9a060e54bf8d69288fbee4904";
 
@@ -269,7 +269,7 @@ - (void)commitWithMessage:(NSString *)commitMessage andVerify:(BOOL) doVerify
 
 	NSMutableArray *arguments = [NSMutableArray arrayWithObjects:@"commit-tree", tree, nil];
 	NSString *parent = self.amend ? @"HEAD^" : @"HEAD";
-	if ([self.repository parseReference:parent]) {
+	if ([self.repository revisionExists:parent]) {
 		[arguments addObject:@"-p"];
 		[arguments addObject:parent];
 	}

Classes/git/PBGitRepository.h

@@ -152,8 +152,8 @@ static NSString * PBStringFromBranchFilterType(PBGitXBranchFilterType type) {
 - (PBGitRevSpecifier*) addBranch: (PBGitRevSpecifier*) rev;
 - (BOOL)removeBranch:(PBGitRevSpecifier *)rev;
 
-- (NSString*) parseSymbolicReference:(NSString*) ref;
-- (NSString*) parseReference:(NSString*) ref;
+- (GTReference*) parseSymbolicReference:(NSString*) ref;
+- (BOOL) revisionExists:(NSString*) spec;
 
 - (void) forceUpdateRevisions;
 - (NSURL*) getIndexURL;

Classes/git/PBGitRepository.m

@@ -290,13 +290,13 @@ - (PBGitRevSpecifier *)headRef
 	if (_headRef)
 		return _headRef;
 
-	NSString* branch = [self parseSymbolicReference: @"HEAD"];
-	if (branch && [branch hasPrefix:@"refs/heads/"])
-		_headRef = [[PBGitRevSpecifier alloc] initWithRef:[PBGitRef refFromString:branch]];
+	GTReference *branchRef = [self parseSymbolicReference: @"HEAD"];
+	if (branchRef && [branchRef.name hasPrefix:@"refs/heads/"])
+		_headRef = [[PBGitRevSpecifier alloc] initWithRef:[PBGitRef refFromString:branchRef.name]];
 	else
 		_headRef = [[PBGitRevSpecifier alloc] initWithRef:[PBGitRef refFromString:@"HEAD"]];
 
-	_headOID = [self OIDForRef:[_headRef ref]];
+	_headOID = branchRef.OID;
 
 	return _headRef;
 }
@@ -1158,23 +1158,21 @@ - (BOOL)executeHook:(NSString *)name arguments:(NSArray *)arguments output:(NSSt
 	return (ret == 0);
 }
 
-- (NSString *)parseReference:(NSString *)reference
+- (BOOL)revisionExists:(NSString *)spec
 {
-	int ret = 1;
-	NSString *ref = [self outputForArguments:[NSArray arrayWithObjects: @"rev-parse", @"--verify", reference, nil] retValue: &ret];
-	if (ret)
-		return nil;
-
-	return ref;
+	return [self.gtRepo lookUpObjectByRevParse:spec error:nil] != nil;
 }
 
-- (NSString*) parseSymbolicReference:(NSString*) reference
+- (GTReference *)parseSymbolicReference:(NSString*) reference
 {
-	NSString* ref = [self outputForArguments:[NSArray arrayWithObjects: @"symbolic-ref", @"-q", reference, nil]];
-	if ([ref hasPrefix:@"refs/"])
-		return ref;
-
-	return nil;
+	GTReference *gtRef = [self.gtRepo lookUpReferenceWithName:reference error:nil];
+	if (!gtRef) return nil;
+	id target = gtRef.unresolvedTarget;
+	if ([target isKindOfClass:[GTReference class]]) {
+		NSString *ref = ((GTReference *)target).name;
+		if ([ref hasPrefix:@"refs/"]) return target;
+	}
+    return nil;
 }
 
 @end