Use libgit2 to find the workdir directly, instead of Objective-Git

Fixes #140
rowanj · Feb 4, 2013 · 3ba6535 · 3ba6535
1 parent 795876d
commit 3ba6535
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/Classes/git/GitRepoFinder.m b/Classes/git/GitRepoFinder.m
@@ -12,9 +12,23 @@ @implementation GitRepoFinder
 
 + (NSURL*)workDirForURL:(NSURL*)fileURL;
 {
-	GTRepository* repo = [[GTRepository alloc] initWithURL:fileURL
-													 error:nil];
-	NSURL* result = repo.fileURL;
+	if (!fileURL.isFileURL)
+	{
+		return nil;
+	}
+	git_repository* repo = nil;
+	git_repository_open_ext(&repo, fileURL.path.UTF8String, GIT_REPOSITORY_OPEN_CROSS_FS, NULL);
+	if (!repo)
+	{
+		return nil;
+	}
+	const char* workdir = git_repository_workdir(repo);
+	NSURL* result = nil;
+	if (workdir)
+	{
+		result = [NSURL fileURLWithPath:[NSString stringWithUTF8String:workdir]];
+	}
+	git_repository_free(repo); repo = nil;
 	return result;
 }
 

diff --git a/Classes/gitx.m b/Classes/gitx.m
@@ -320,7 +320,7 @@ void handleGitXSearch(NSURL *repositoryURL, NSMutableArray *arguments)
     NSString *pwd = [[[NSProcessInfo processInfo] environment] objectForKey:@"PWD"];
 
 	NSURL* pwdURL = [NSURL fileURLWithPath:pwd];
-	NSURL* repoURL = [GitRepoFinder workDirForURL:pwdURL];
+	NSURL* repoURL = [GitRepoFinder fileURLForURL:pwdURL];
 	return repoURL;
 
 }