Merge pull request laullon#5 from carlbrown/master

mxcl · mxcl · commit ad2edbd270f7 · 2013-04-18T08:57:54.000-07:00
Fix worktree path when running gitx inside a submodule directory
diff --git a/PBGitRepository.m b/PBGitRepository.m
@@ -509,6 +509,8 @@ - (NSString *)workingDirectory
 {
 	if ([self.fileURL.path hasSuffix:@"/.git"])
 		return [self.fileURL.path substringToIndex:[self.fileURL.path length] - 5];
+    else if ([[self config] valueForKeyPath:@"core.worktree"])
+        return [self.fileURL.path stringByAppendingPathComponent:[[self config] valueForKeyPath:@"core.worktree"]];
 	else
         return self.fileURL.path; // probably submodule
 }

Original file line number	Diff line number	Diff line change
`@@ -509,6 +509,8 @@ - (NSString *)workingDirectory`
`509`	`509`	`{`
`510`	`510`	`if ([self.fileURL.path hasSuffix:@"/.git"])`
`511`	`511`	`return [self.fileURL.path substringToIndex:[self.fileURL.path length] - 5];`
	`512`	`+ else if ([[self config] valueForKeyPath:@"core.worktree"])`
	`513`	`+ return [self.fileURL.path stringByAppendingPathComponent:[[self config] valueForKeyPath:@"core.worktree"]];`
`512`	`514`	`else`
`513`	`515`	`return self.fileURL.path; // probably submodule`
`514`	`516`	`}`