Use libgit2 function to get the branch name.

Author: tiennou

ObjectiveGit/GTBranch.m

@@ -87,7 +87,11 @@ - (instancetype)initWithReference:(GTReference *)ref {
 }
 
 - (NSString *)name {
-	return self.reference.name;
+	const char *charName;
+	int gitError = git_branch_name(&charName, self.reference.git_reference);
+	if (gitError != GIT_OK || charName == NULL) return nil;
+
+	return @(charName);
 }
 
 - (NSString *)shortName {

ObjectiveGit/GTRepository+Merging.m

@@ -158,7 +158,7 @@ - (BOOL)mergeBranchIntoCurrentBranch:(GTBranch *)branch withError:(NSError **)er
 		NSArray *parents = @[ localCommit, remoteCommit ];
 
 		// FIXME: This is stepping on the local tree
-		GTCommit *mergeCommit = [self createCommitWithTree:newTree  message:message parents:parents updatingReferenceNamed:localBranch.name error:error];
+		GTCommit *mergeCommit = [self createCommitWithTree:newTree message:message parents:parents updatingReferenceNamed:localBranch.reference.name error:error];
 		if (!mergeCommit) {
 			return NO;
 		}

ObjectiveGitTests/GTBranchSpec.m

@@ -35,6 +35,16 @@
 	expect(error).to(beNil());
 });
 
+describe(@"name", ^{
+	it(@"should use just the branch name for a local branch", ^{
+		expect(masterBranch.name).to(equal(@"master"));
+	});
+
+	it(@"should include the remote name for a tracking branch", ^{
+		expect(trackingBranch.name).to(equal(@"origin/master"));
+	});
+});
+
 describe(@"shortName", ^{
 	it(@"should use just the branch name for a local branch", ^{
 		expect(masterBranch.shortName).to(equal(@"master"));

ObjectiveGitTests/GTRepositorySpec.m

@@ -292,7 +292,7 @@
 		GTBranch *currentBranch = [repository currentBranchWithError:&error];
 		expect(currentBranch).notTo(beNil());
 		expect(error).to(beNil());
-		expect(currentBranch.name).to(equal(@"refs/heads/master"));
+		expect(currentBranch.name).to(equal(@"master"));
 	});
 });
 
@@ -332,7 +332,7 @@
 		expect(error).to(beNil());
 		expect(@(branches.count)).to(equal(@1));
 		GTBranch *remoteBranch = branches[0];
-		expect(remoteBranch.name).to(equal(@"refs/remotes/origin/master"));
+		expect(remoteBranch.name).to(equal(@"origin/master"));
 	});
 });