Permalink
Browse files

explicitly disable external diff so we get the results we need even i…

…f the user has an external diff configured
  • Loading branch information...
1 parent 62319b8 commit 395877f005ab22b0af777eddd6a494fd5a3cac6b @sleifer sleifer committed with Aug 22, 2010
Showing with 3 additions and 3 deletions.
  1. +1 −1 PBDiffWindowController.m
  2. +2 −2 gitx.m
@@ -34,7 +34,7 @@ + (void) showDiffWindowWithFiles:(NSArray *)filePaths fromCommit:(PBGitCommit *)
diffCommit = [startCommit.repository headCommit];
NSString *commitSelector = [NSString stringWithFormat:@"%@..%@", [startCommit realSha], [diffCommit realSha]];
- NSMutableArray *arguments = [NSMutableArray arrayWithObjects:@"diff", commitSelector, nil];
+ NSMutableArray *arguments = [NSMutableArray arrayWithObjects:@"diff", @"--no-ext-diff", commitSelector, nil];
if (![PBGitDefaults showWhitespaceDifferences])
[arguments insertObject:@"-w" atIndex:1];
View
@@ -124,9 +124,9 @@ void handleSTDINDiff()
}
}
-void handleDiffWithArguments(NSURL *repositoryURL, NSMutableArray *arguments)
+void handleDiffWithArguments(NSURL *repositoryURL, NSArray *arguments)
{
- [arguments insertObject:@"diff" atIndex:0];
+ arguments = [[NSArray arrayWithObjects:@"diff", @"--no-ext-diff", nil] arrayByAddingObjectsFromArray:arguments];
int retValue = 1;
NSString *diffOutput = [PBEasyPipe outputForCommand:[PBGitBinary path] withArgs:arguments inDir:[repositoryURL path] retValue:&retValue];

0 comments on commit 395877f

Please sign in to comment.