kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

explicitly disable external diff so we get the results we need even if the user has an external diff configured

Browse Source
This commit is contained in:
Simeon Leifer
2010-08-22 23:29:58 +08:00
committed by Nathan Kinsinger
parent 62319b8cd9
commit 395877f005
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PBDiffWindowController.m
+1 -1
View File
@@ -34,7 +34,7 @@
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];
gitx.m
+2 -2
View File
@@ -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];