Update to latest upstream objective-git

Author: rowanj

Classes/Controllers/PBRefController.m

@@ -251,7 +251,7 @@ - (void) showTagInfoSheet:(PBRefMenuItem *)sender
 	NSError *error = nil;
 	NSString *tagName = [(PBGitRef *)[sender refish] tagName];
 	NSString *tagRef = [@"refs/tags/" stringByAppendingString:tagName];
-	GTObject *object = [historyController.repository.gtRepo lookupObjectByRefspec:tagRef error:&error];
+	GTObject *object = [historyController.repository.gtRepo lookupObjectByRevParse:tagRef error:&error];
 	if (!object) {
 		NSLog(@"Couldn't look up ref %@:%@", tagRef, [error debugDescription]);
 		return;

Classes/git/PBGitGrapher.mm

@@ -13,7 +13,7 @@
 #import "PBGitGraphLine.h"
 
 #import <vector>
-#import <git2/oid.h>
+
 #include <algorithm>
 
 using namespace std;

Classes/git/PBGitLane.h

@@ -6,7 +6,6 @@
 //  Copyright 2008 __MyCompanyName__. All rights reserved.
 //
 #import <Cocoa/Cocoa.h>
-#include <git2/oid.h>
 
 class PBGitLane {
 	static int s_colorIndex;

Classes/git/PBGitRepository.m

@@ -840,7 +840,7 @@ - (BOOL) createTag:(NSString *)tagName message:(NSString *)message atRefish:(id
 
 	NSError *error = nil;
 
-	GTObject *object = [self.gtRepo lookupObjectByRefspec:[target refishName] error:&error];
+	GTObject *object = [self.gtRepo lookupObjectByRevParse:[target refishName] error:&error];
 	GTTag *newTag = nil;
 	if (object && !error) {
 		newTag = [self.gtRepo createTagNamed:tagName target:object tagger:self.gtRepo.userSignatureForNow message:message error:&error];

Classes/git/PBGitRevList.mm

@@ -14,12 +14,12 @@
 #import "PBEasyPipe.h"
 #import "PBGitBinary.h"
 
-#include <ObjectiveGit/ObjectiveGit.h>
+#import <ObjectiveGit/ObjectiveGit.h>
 
-#include <ext/stdio_filebuf.h>
-#include <iostream>
-#include <string>
-#include <map>
+#import <ext/stdio_filebuf.h>
+#import <iostream>
+#import <string>
+#import <map>
 
 using namespace std;
 
@@ -129,7 +129,7 @@ - (void) setupEnumerator:(GTEnumerator*)enumerator
 	[enumerator resetWithOptions:GTEnumeratorOptionsTimeSort];
 	//	[enumerator resetWithOptions:GTEnumeratorOptionsTopologicalSort];
 	if (rev.isSimpleRef) {
-		GTObject *object = [repo lookupObjectByRefspec:rev.simpleRef error:&error];
+		GTObject *object = [repo lookupObjectByRevParse:rev.simpleRef error:&error];
 		if ([object isKindOfClass:[GTCommit class]]) {
 			[enumerator pushSHA:object.SHA error:&error];
 		}
@@ -149,7 +149,7 @@ - (void) setupEnumerator:(GTEnumerator*)enumerator
 			} else if ([param isEqualToString:@"--tags"]) {
 				for (NSString *ref in allRefs) {
 					if ([ref hasPrefix:@"refs/tags/"]) {
-						GTObject *tag = [repo lookupObjectByRefspec:ref error:&error];
+						GTObject *tag = [repo lookupObjectByRevParse:ref error:&error];
 						GTCommit *commit = nil;
 						if ([tag isKindOfClass:[GTCommit class]]) {
 							commit = (GTCommit *)tag;

Classes/git/PBGitSHA.h

@@ -7,8 +7,6 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#include <git2/oid.h>
-
 
 @interface PBGitSHA : NSObject <NSCopying>
 

Classes/git/PBGitSHA.m

@@ -8,7 +8,6 @@
 
 #import "PBGitSHA.h"
 
-#import <git2/errors.h>
 
 @interface PBGitSHA ()
 

GitX.xcodeproj/project.pbxproj

@@ -301,6 +301,13 @@
 			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
 			remoteInfo = ObjectiveGit;
 		};
+		4A74FA8A183E44DD003F7184 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4A4EF09F142CBAD5001B8CDF /* ObjectiveGitFramework.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = F6CBB4A417FFD50500404926;
+			remoteInfo = "ObjectiveGit-iOS-arm64";
+		};
 		4A774CBC142F464D00E158CC /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
@@ -789,6 +796,7 @@
 				4A4EF0AF142CBAD5001B8CDF /* ObjectiveGit.framework */,
 				4ADAA9C21602ADB8007A0E6F /* ObjectiveGitTests.octest */,
 				4A4EF0B3142CBAD5001B8CDF /* libObjectiveGit-iOS.a */,
+				4A74FA8B183E44DD003F7184 /* libObjectiveGit-iOS.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1366,6 +1374,13 @@
 			remoteRef = 4A68AD6E14A0050F006DE321 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		4A74FA8B183E44DD003F7184 /* libObjectiveGit-iOS.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libObjectiveGit-iOS.a";
+			remoteRef = 4A74FA8A183E44DD003F7184 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		4A8F6B4514A9B6110002F4D7 /* MGScopeBar.app */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.application;
@@ -1818,7 +1833,6 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/objective-git/libgit2/include\"";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1837,7 +1851,6 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/objective-git/libgit2/include\"";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				SDKROOT = macosx;

GitX_Prefix.pch

@@ -2,9 +2,8 @@
 
 #ifdef __OBJC__
     #import <Cocoa/Cocoa.h>
-	#ifndef __cplusplus
-		#import <ObjectiveGit/ObjectiveGit.h>
-	#endif
+	#import <ObjectiveGit/ObjectiveGit.h>
+
 #endif
 
 #define DEPRECATED __attribute__ ((deprecated))