Merge pull request libgit2#339 from libgit2/submodule-index-add

Submodule index add

Author: mdiep

Classes/GTIndex.h

@@ -111,6 +111,8 @@
 
 // Add an entry to the index.
 //
+// Note that this *cannot* add submodules. See -[GTSubmodule addToIndex:].
+//
 // entry - The entry to add.
 // error - The error if one occurred.
 //
@@ -120,6 +122,8 @@
 // Add an entry (by relative path) to the index.
 // Will fail if the receiver's repository is nil.
 //
+// Note that this *cannot* add submodules. See -[GTSubmodule addToIndex:].
+//
 // file  - The path (relative to the root of the repository) of the file to add.
 // error - The error if one occurred.
 //

Classes/GTSubmodule.h

@@ -135,4 +135,13 @@ typedef enum {
 // Returns whether the initialization succeeded.
 - (BOOL)writeToParentConfigurationDestructively:(BOOL)overwrite error:(NSError **)error;
 
+/// Add the current HEAD to the parent repository's index.
+///
+/// Note that it does *not* write the index.
+///
+/// error - The error if one occurred.
+///
+/// Returns whether the add was successful.
+- (BOOL)addToIndex:(NSError **)error;
+
 @end

Classes/GTSubmodule.m

@@ -140,6 +140,16 @@ - (BOOL)writeToParentConfigurationDestructively:(BOOL)overwrite error:(NSError *
 	return YES;
 }
 
+- (BOOL)addToIndex:(NSError **)error {
+	int gitError = git_submodule_add_to_index(self.git_submodule, 0);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to add submodule %@ to its parent's index.", self.name];
+		return NO;
+	}
+
+	return YES;
+}
+
 #pragma mark NSObject
 
 - (NSString *)description {

ObjectiveGitTests/GTSubmoduleSpec.m

@@ -99,6 +99,21 @@
 	expect(submodule.path).to.equal(@"new_submodule_path");
 });
 
+it(@"should add its HEAD to its parent's index", ^{
+	GTSubmodule *submodule = [repo submoduleWithName:@"Test_App" error:NULL];
+	expect(submodule).notTo.beNil();
+
+	GTRepository *submoduleRepository = [[GTRepository alloc] initWithURL:[repo.fileURL URLByAppendingPathComponent:submodule.path] error:NULL];
+	expect(submoduleRepository).notTo.beNil();
+
+	GTCommit *commit = [submoduleRepository lookUpObjectByRevParse:@"HEAD^" error:NULL];
+	BOOL success = [submoduleRepository checkoutCommit:commit strategy:GTCheckoutStrategyForce error:NULL progressBlock:nil];
+	expect(success).to.beTruthy();
+
+	success = [submodule addToIndex:NULL];
+	expect(success).to.beTruthy();
+});
+
 describe(@"clean, checked out submodule", ^{
 	__block GTSubmodule *submodule;