Merge branch 'master' into conflict_marked_file

Author: tiennou

.travis.yml

@@ -1,18 +1,30 @@
-osx_image: xcode8
+#
+# .travis.yml
+# Objective-Git
+#
+# https://docs.travis-ci.com/user/reference/osx/
+# https://docs.travis-ci.com/user/build-stages/matrix-expansion/
+#
+---
+os: osx
+osx_image: xcode9.3
 language: objective-c
+
 matrix:
   fast_finish: true
   include:
-    - osx_image: xcode8
+    - osx_image: xcode9.3
       env:
         - SCHEME="ObjectiveGit Mac"
-    - osx_image: xcode8
+    - osx_image: xcode9.3
       env:
         - SCHEME="ObjectiveGit iOS"
+
 before_install:
   - gem install xcpretty
   - gem install xcpretty-travis-formatter
 install: script/bootstrap
 script: script/cibuild
+
 notifications:
   email: false

Cartfile.private

@@ -1,4 +1,4 @@
-github "jspahrsummers/xcconfigs" >= 0.7.1
-github "Quick/Quick" ~> 0.9.2
-github "Quick/Nimble" ~> 4.0
-github "ZipArchive/ZipArchive" ~> 1.1
+github "jspahrsummers/xcconfigs" "master"
+github "Quick/Quick" ~> 1.2.0
+github "Quick/Nimble" ~> 7.1.0
+github "ZipArchive/ZipArchive" ~> 2.1.2

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v4.1.0"
-github "Quick/Quick" "v0.9.3"
-github "ZipArchive/ZipArchive" "v1.6.2"
-github "jspahrsummers/xcconfigs" "0.9"
+github "Quick/Nimble" "v7.1.0"
+github "Quick/Quick" "v1.2.0"
+github "ZipArchive/ZipArchive" "v2.1.2"
+github "jspahrsummers/xcconfigs" "bb795558a76e5daf3688500055bbcfe243bffa8d"

Carthage/Checkouts/Nimble

@@ -88,7 +88,7 @@
     _Pragma("clang diagnostic pop")
 
 /*** implementation details follow ***/
-typedef void (^gt_ext_cleanupBlock_t)();
+typedef void (^gt_ext_cleanupBlock_t)(void);
 
 void gt_ext_executeCleanupBlock (__strong gt_ext_cleanupBlock_t *block);
 

Carthage/Checkouts/Quick

@@ -57,12 +57,14 @@ framework module ObjectiveGit {
 	header "git2/sys/hashsig.h"
 	header "git2/sys/index.h"
 	header "git2/sys/mempack.h"
+	header "git2/sys/merge.h"
 	header "git2/sys/odb_backend.h"
 	header "git2/sys/refdb_backend.h"
 	header "git2/sys/reflog.h"
 	header "git2/sys/refs.h"
 	header "git2/sys/repository.h"
 	header "git2/sys/transport.h"
+	header "git2/sys/time.h"
 	header "git2/cred_helpers.h"
 	header "git2/sys/openssl.h"
 	header "git2/sys/stream.h"

Carthage/Checkouts/ZipArchive

@@ -104,8 +104,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (git_blob *)git_blob __attribute__((objc_returns_inner_pointer));
 
 - (git_off_t)size;
-- (NSString *)content;
-- (NSData * _Nullable)data;
+- (NSString * _Nullable)content;
+- (NSData *)data;
 
 /// Attempts to apply the filter list for `path` to the blob.
 ///

Carthage/Checkouts/xcconfigs

@@ -40,7 +40,7 @@
 @implementation GTBlob
 
 - (NSString *)description {
-  return [NSString stringWithFormat:@"<%@: %p> size: %zi, content: %@, data = %@", NSStringFromClass([self class]), self, [self size], [self content], [self data]];
+  return [NSString stringWithFormat:@"<%@: %p> size: %lli, content: %@, data = %@", NSStringFromClass([self class]), self, [self size], [self content], [self data]];
 }
 
 

External/libcrypto.a

@@ -50,6 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly) GTBranchType branchType;
 @property (nonatomic, readonly, strong) GTRepository *repository;
 @property (nonatomic, readonly, strong) GTReference *reference;
+@property (nonatomic, readonly, getter=isHEAD) BOOL HEAD;
 
 + (NSString *)localNamePrefix;
 + (NSString *)remoteNamePrefix;
@@ -59,18 +60,16 @@ NS_ASSUME_NONNULL_BEGIN
 /// Designated initializer.
 ///
 /// ref  - The branch reference to wrap. Must not be nil.
-/// repo - The repository containing the branch. Must not be nil.
 ///
 /// Returns the initialized receiver.
-- (instancetype _Nullable)initWithReference:(GTReference *)ref repository:(GTRepository *)repo NS_DESIGNATED_INITIALIZER;
+- (instancetype _Nullable)initWithReference:(GTReference *)ref NS_DESIGNATED_INITIALIZER;
 
 /// Convenience class initializer.
 ///
 /// ref  - The branch reference to wrap. Must not be nil.
-/// repo - The repository containing the branch. Must not be nil.
 ///
 /// Returns an initialized instance.
-+ (instancetype _Nullable)branchWithReference:(GTReference *)ref repository:(GTRepository *)repo;
++ (instancetype _Nullable)branchWithReference:(GTReference *)ref;
 
 /// Get the target commit for this branch
 ///
@@ -79,6 +78,9 @@ NS_ASSUME_NONNULL_BEGIN
 /// returns a GTCommit object or nil if an error occurred
 - (GTCommit * _Nullable)targetCommitWithError:(NSError **)error;
 
+/// Renames the branch. Setting `force` to YES to delete another branch with the same name.
+- (BOOL)rename:(NSString *)name force:(BOOL)force error:(NSError **)error;
+
 /// Count all commits in this branch
 ///
 /// error(out) - will be filled if an error occurs

External/libextobjc/extobjc/EXTScope.h

@@ -32,6 +32,7 @@
 #import "GTRemote.h"
 #import "GTRepository.h"
 #import "NSError+Git.h"
+#import "NSData+Git.h"
 
 #import "git2/branch.h"
 #import "git2/errors.h"
@@ -65,30 +66,32 @@ + (NSString *)remoteNamePrefix {
 	return @"refs/remotes/";
 }
 
-+ (instancetype)branchWithReference:(GTReference *)ref repository:(GTRepository *)repo {
-	return [[self alloc] initWithReference:ref repository:repo];
++ (instancetype)branchWithReference:(GTReference *)ref {
+	return [[self alloc] initWithReference:ref];
 }
 
 - (instancetype)init {
 	NSAssert(NO, @"Call to an unavailable initializer.");
 	return nil;
 }
 
-- (instancetype)initWithReference:(GTReference *)ref repository:(GTRepository *)repo {
+- (instancetype)initWithReference:(GTReference *)ref {
 	NSParameterAssert(ref != nil);
-	NSParameterAssert(repo != nil);
 
 	self = [super init];
 	if (self == nil) return nil;
 
-	_repository = repo;
 	_reference = ref;
 
 	return self;
 }
 
 - (NSString *)name {
-	return self.reference.name;
+	const char *charName;
+	int gitError = git_branch_name(&charName, self.reference.git_reference);
+	if (gitError != GIT_OK || charName == NULL) return nil;
+
+	return @(charName);
 }
 
 - (NSString *)shortName {
@@ -112,36 +115,39 @@ - (GTOID *)OID {
 }
 
 - (NSString *)remoteName {
-	if (self.branchType == GTBranchTypeLocal) return nil;
-
-	const char *name;
-	int gitError = git_branch_name(&name, self.reference.git_reference);
+	git_buf remote_name = GIT_BUF_INIT_CONST(0, NULL);
+	int gitError = git_branch_remote_name(&remote_name, self.repository.git_repository, self.reference.name.UTF8String);
 	if (gitError != GIT_OK) return nil;
 
-	// Find out where the remote name ends.
-	const char *end = strchr(name, '/');
-	if (end == NULL || end == name) return nil;
-
-	return [[NSString alloc] initWithBytes:name length:end - name encoding:NSUTF8StringEncoding];
+	NSData *data = [NSData git_dataWithBuffer:&remote_name];
+	return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
 }
 
 - (GTCommit *)targetCommitWithError:(NSError **)error {
-	if (self.OID == nil) {
+	GTOID *oid = self.OID;
+	if (oid == nil) {
 		if (error != NULL) *error = GTReference.invalidReferenceError;
 		return nil;
 	}
 
-	return [self.repository lookUpObjectByOID:self.OID objectType:GTObjectTypeCommit error:error];
+	return [self.repository lookUpObjectByOID:oid objectType:GTObjectTypeCommit error:error];
 }
 
 - (NSUInteger)numberOfCommitsWithError:(NSError **)error {
 	GTEnumerator *enumerator = [[GTEnumerator alloc] initWithRepository:self.repository error:error];
 	if (enumerator == nil) return NSNotFound;
 
-	if (![enumerator pushSHA:self.OID.SHA error:error]) return NSNotFound;
+	GTOID *oid = self.OID;
+	if (oid == nil) return NSNotFound;
+
+	if (![enumerator pushSHA:oid.SHA error:error]) return NSNotFound;
 	return [enumerator countRemainingObjects:error];
 }
 
+- (GTRepository *)repository {
+	return self.reference.repository;
+}
+
 - (GTBranchType)branchType {
 	if (self.reference.remote) {
 		return GTBranchTypeRemote;
@@ -150,8 +156,14 @@ - (GTBranchType)branchType {
 	}
 }
 
+- (BOOL)isHEAD {
+	return (git_branch_is_head(self.reference.git_reference) ? YES : NO);
+}
+
 - (NSArray *)uniqueCommitsRelativeToBranch:(GTBranch *)otherBranch error:(NSError **)error {
-	GTEnumerator *enumerator = [self.repository enumeratorForUniqueCommitsFromOID:self.OID relativeToOID:otherBranch.OID error:error];
+	GTOID *oid = self.OID;
+	GTOID *otherOID = otherBranch.OID;
+	GTEnumerator *enumerator = [self.repository enumeratorForUniqueCommitsFromOID:oid relativeToOID:otherOID error:error];
 	return [enumerator allObjectsWithError:error];
 }
 
@@ -165,9 +177,29 @@ - (BOOL)deleteWithError:(NSError **)error {
 	return YES;
 }
 
+- (BOOL)rename:(NSString *)name force:(BOOL)force error:(NSError **)error {
+	git_reference *git_ref;
+	int gitError = git_branch_move(&git_ref, self.reference.git_reference, name.UTF8String, (force ? 1 : 0));
+	if (gitError != GIT_OK) {
+		if (error) *error = [NSError git_errorFor:gitError description:@"Rename branch failed"];
+		return NO;
+	}
+
+	GTReference *renamedRef = [[GTReference alloc] initWithGitReference:git_ref repository:self.repository];
+	NSAssert(renamedRef, @"Unable to allocate renamed ref");
+	_reference = renamedRef;
+
+	return YES;
+}
+
 - (GTBranch *)trackingBranchWithError:(NSError **)error success:(BOOL *)success {
+	BOOL underSuccess = NO;
+	if (success == NULL) {
+		success = &underSuccess;
+	}
+
 	if (self.branchType == GTBranchTypeRemote) {
-		if (success != NULL) *success = YES;
+		*success = YES;
 		return self;
 	}
 
@@ -176,25 +208,32 @@ - (GTBranch *)trackingBranchWithError:(NSError **)error success:(BOOL *)success
 
 	// GIT_ENOTFOUND means no tracking branch found.
 	if (gitError == GIT_ENOTFOUND) {
-		if (success != NULL) *success = YES;
+		*success = YES;
 		return nil;
 	}
 
 	if (gitError != GIT_OK) {
-		if (success != NULL) *success = NO;
+		*success = NO;
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to create reference to tracking branch from %@", self];
 		return nil;
 	}
 
 	if (trackingRef == NULL) {
-		if (success != NULL) *success = NO;
+		*success = NO;
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Got a NULL remote ref for %@", self];
 		return nil;
 	}
 
-	if (success != NULL) *success = YES;
+	GTReference *upsteamRef = [[GTReference alloc] initWithGitReference:trackingRef repository:self.repository];
+	if (upsteamRef == nil) {
+		*success = NO;
+		if (error != NULL) *error = [NSError git_errorFor:GIT_ERROR description:@"Failed to allocate upstream ref"];
+		return nil;
+	}
+
+	*success = YES;
 
-	return [[self class] branchWithReference:[[GTReference alloc] initWithGitReference:trackingRef repository:self.repository] repository:self.repository];
+	return [[self class] branchWithReference:upsteamRef];
 }
 
 - (BOOL)updateTrackingBranch:(GTBranch *)trackingBranch error:(NSError **)error {
@@ -216,11 +255,13 @@ - (GTBranch *)reloadedBranchWithError:(NSError **)error {
 	GTReference *reloadedRef = [self.reference reloadedReferenceWithError:error];
 	if (reloadedRef == nil) return nil;
 
-	return [[self.class alloc] initWithReference:reloadedRef repository:self.repository];
+	return [[self.class alloc] initWithReference:reloadedRef];
 }
 
 - (BOOL)calculateAhead:(size_t *)ahead behind:(size_t *)behind relativeTo:(GTBranch *)branch error:(NSError **)error {
-	return [self.repository calculateAhead:ahead behind:behind ofOID:self.OID relativeToOID:branch.OID error:error];
+	GTOID *oid = self.OID;
+	GTOID *branchOID = branch.OID;
+	return [self.repository calculateAhead:ahead behind:behind ofOID:oid relativeToOID:branchOID error:error];
 }
 
 @end

External/libgit2

@@ -87,13 +87,13 @@ typedef NS_OPTIONS(NSInteger, GTCheckoutNotifyFlags) {
 @property (assign) GTCheckoutStrategyType strategy;
 
 /// The checkout progress block that was passed in.
-@property (copy) void (^progressBlock)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps);
+@property (copy, nullable) void (^progressBlock)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps);
 
 /// The notification flags currently enabled.
 @property (assign) GTCheckoutNotifyFlags notifyFlags;
 
 /// The checkout notification block that was passed in.
-@property (copy) int (^notifyBlock)(GTCheckoutNotifyFlags why, NSString *path, GTDiffFile *baseline, GTDiffFile *target, GTDiffFile *workdir);
+@property (copy, nullable) int (^notifyBlock)(GTCheckoutNotifyFlags why, NSString *path, GTDiffFile *baseline, GTDiffFile *target, GTDiffFile *workdir);
 
 /// An array of strings used to restrict what will be checked out.
 @property (copy) NSArray <NSString *> *pathSpecs;

External/libssh2

@@ -39,9 +39,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface GTCommit : GTObject {}
 
+@property (nonatomic, readonly, strong) GTOID *OID;
 @property (nonatomic, readonly, strong) GTSignature * _Nullable author;
 @property (nonatomic, readonly, strong) GTSignature * _Nullable committer;
 @property (nonatomic, readonly, copy) NSArray<GTCommit *> *parents;
+@property (nonatomic, readonly, copy) NSArray<GTOID *> *parentOIDs;
 @property (nonatomic, readonly) NSString * _Nullable message;
 @property (nonatomic, readonly) NSString *messageDetails;
 @property (nonatomic, readonly) NSString *messageSummary;