From 395877f005ab22b0af777eddd6a494fd5a3cac6b Mon Sep 17 00:00:00 2001 From: Simeon Leifer Date: Sun, 22 Aug 2010 23:29:58 +0800 Subject: [PATCH] explicitly disable external diff so we get the results we need even if the user has an external diff configured --- PBDiffWindowController.m | 2 +- gitx.m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PBDiffWindowController.m b/PBDiffWindowController.m index 06403d5..ae545d9 100644 --- a/PBDiffWindowController.m +++ b/PBDiffWindowController.m @@ -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]; diff --git a/gitx.m b/gitx.m index 3230d01..8c1ae4e 100644 --- a/gitx.m +++ b/gitx.m @@ -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];