Skip to content

Commit 3861dee

Browse files
committed
Require Git 1.6.0 or higher
Git 1.6.0 was released over a year ago now, so it shouldn't be too hard to get people to upgrade to that. We need 1.6.0 for the --children revlist option. Requiring Git 1.6.0 or higher means we can also revert a94981f (RevList: Don't rely on the presence of %x00) sometime.
1 parent c95a22a commit 3861dee

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

PBGitBinary.h

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#import <Cocoa/Cocoa.h>
1010

11+
#define MIN_GIT_VERSION "1.6.0"
1112

1213
@interface PBGitBinary : NSObject {
1314

PBGitBinary.m

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ + (BOOL) acceptBinary:(NSString *)path
3737
if (!version)
3838
return NO;
3939

40-
int c = [version compare:@"1.5.4"];
40+
int c = [version compare:@"" MIN_GIT_VERSION];
4141
if (c == NSOrderedSame || c == NSOrderedDescending) {
4242
gitPath = path;
4343
return YES;
@@ -60,7 +60,7 @@ + (void) initialize
6060
alternateButton:nil
6161
otherButton:nil
6262
informativeTextWithFormat:@"You entered a custom git path in the Preferences pane, "
63-
"but this path is not a valid git v1.5.4 or higher binary. We're going to use the default "
63+
"but this path is not a valid git v" MIN_GIT_VERSION " or higher binary. We're going to use the default "
6464
"search paths instead"] runModal];
6565
}
6666

@@ -80,7 +80,7 @@ + (void) initialize
8080
return;
8181
}
8282

83-
NSLog(@"Could not find a git binary higher than version 1.5.4.");
83+
NSLog(@"Could not find a git binary higher than version " MIN_GIT_VERSION);
8484
}
8585

8686
+ (NSString *) path;
@@ -109,7 +109,7 @@ + (NSArray *) searchLocations
109109
+ (NSString *) notFoundError
110110
{
111111
NSMutableString *error = [NSMutableString stringWithString:
112-
@"Could not find a git binary version 1.5.4 or higher.\n"
112+
@"Could not find a git binary version " MIN_GIT_VERSION " or higher.\n"
113113
"Please make sure there is a git binary in one of the following locations:\n\n"];
114114
for (NSString *location in [PBGitBinary searchLocations]) {
115115
[error appendFormat:@"\t%@\n", location];

0 commit comments

Comments
 (0)