Remove assumption that local and remote branches have same shortName

Author: Ben Chatelain

ObjectiveGit/GTRepository+RemoteOperations.m

@@ -185,8 +185,19 @@ - (BOOL)pushBranches:(NSArray *)branches toRemote:(GTRemote *)remote withOptions
 	// Build refspecs for the passed in branches
 	refspecs = [NSMutableArray arrayWithCapacity:branches.count];
 	for (GTBranch *branch in branches) {
-		// Assumes upstream branch reference has same name as local tracking branch
-		[refspecs addObject:[NSString stringWithFormat:@"%@:%@", branch.reference.name, branch.reference.name]];
+		// Default remote reference for when branch doesn't exist on remote - create with same short name
+		NSString *remoteBranchReference = [NSString stringWithFormat:@"refs/heads/%@", branch.shortName];
+
+		BOOL success = NO;
+		GTBranch *trackingBranch = [branch trackingBranchWithError:error success:&success];
+
+		if (success && trackingBranch) {
+			// Use remote branch short name from trackingBranch, which could be different
+			// (e.g. refs/heads/master:refs/heads/my_master)
+			remoteBranchReference = [NSString stringWithFormat:@"refs/heads/%@", trackingBranch.shortName];
+		}
+
+		[refspecs addObject:[NSString stringWithFormat:@"refs/heads/%@:%@", branch.shortName, remoteBranchReference]];
 	}
 
 	return [self pushRefspecs:refspecs toRemote:remote withOptions:options error:error progress:progressBlock];

ObjectiveGitTests/GTRemotePushSpec.m

@@ -184,12 +184,12 @@
 			localTrackingBranch = [masterBranch trackingBranchWithError:&error success:&success];
 			expect(error).to(beNil());
 			expect(@(success)).to(beTrue());
-//			expect(@([localTrackingBranch numberOfCommitsWithError:NULL])).to(equal(@3));
+			expect(@([localTrackingBranch numberOfCommitsWithError:NULL])).to(equal(@4));
 
-			// Refetch master branch to ensure the commit count is accurate
+			// Refresh remote master branch to ensure the commit count is accurate
 			remoteMasterBranch = localBranchWithName(@"master", remoteRepo);
 
-			// Number of commits on remote after push
+			// Number of commits in remote repo after push
 			expect(@([remoteMasterBranch numberOfCommitsWithError:NULL])).to(equal(@4));
 
 			// Verify commit is in remote