Skip to content
Browse files

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.
  • Loading branch information...
1 parent c95a22a commit 3861deecfaa204cd127263dc8c8963ec974a27f4 @pieter pieter committed
Showing with 5 additions and 4 deletions.
  1. +1 −0 PBGitBinary.h
  2. +4 −4 PBGitBinary.m
View
1 PBGitBinary.h
@@ -8,6 +8,7 @@
#import <Cocoa/Cocoa.h>
+#define MIN_GIT_VERSION "1.6.0"
@interface PBGitBinary : NSObject {
View
8 PBGitBinary.m
@@ -37,7 +37,7 @@ + (BOOL) acceptBinary:(NSString *)path
if (!version)
return NO;
- int c = [version compare:@"1.5.4"];
+ int c = [version compare:@"" MIN_GIT_VERSION];
if (c == NSOrderedSame || c == NSOrderedDescending) {
gitPath = path;
return YES;
@@ -60,7 +60,7 @@ + (void) initialize
alternateButton:nil
otherButton:nil
informativeTextWithFormat:@"You entered a custom git path in the Preferences pane, "
- "but this path is not a valid git v1.5.4 or higher binary. We're going to use the default "
+ "but this path is not a valid git v" MIN_GIT_VERSION " or higher binary. We're going to use the default "
"search paths instead"] runModal];
}
@@ -80,7 +80,7 @@ + (void) initialize
return;
}
- NSLog(@"Could not find a git binary higher than version 1.5.4.");
+ NSLog(@"Could not find a git binary higher than version " MIN_GIT_VERSION);
}
+ (NSString *) path;
@@ -109,7 +109,7 @@ + (NSArray *) searchLocations
+ (NSString *) notFoundError
{
NSMutableString *error = [NSMutableString stringWithString:
- @"Could not find a git binary version 1.5.4 or higher.\n"
+ @"Could not find a git binary version " MIN_GIT_VERSION " or higher.\n"
"Please make sure there is a git binary in one of the following locations:\n\n"];
for (NSString *location in [PBGitBinary searchLocations]) {
[error appendFormat:@"\t%@\n", location];

0 comments on commit 3861dee

Please sign in to comment.
Something went wrong with that request. Please try again.