A nu name.

libgit2 · Jun 26, 2015 · 7d660e5 · 7d660e5
1 parent 9eb3981
commit 7d660e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/ObjectiveGit/GTRepository.h b/ObjectiveGit/GTRepository.h
@@ -565,19 +565,15 @@ NS_ASSUME_NONNULL_BEGIN
 /// Returns whether `ahead` and `behind` were successfully calculated.
 - (BOOL)calculateAhead:(size_t *)ahead behind:(size_t *)behind ofOID:(GTOID *)headOID relativeToOID:(GTOID *)baseOID error:(NSError **)error;
 
-/// Creates an enumerator for walking the local commits in relative to the
-/// tracking branch.
+/// Creates an enumerator for walking the local commits beginning at one OID and
+/// ending at another. It will *not* include the commit for `endingOID`.
 ///
-/// Note that this will only be accurate iff `trackingBranch` truly is
-/// `localBranch`s tracking branch. If you need more general functionality, see
-/// -[GTBranch uniqueCommitsRelativeToBranch:error:].
-///
-/// localBranch    - The local branch.
-/// trackingBranch - `localBranch`s tracking branch.
-/// error          - The error if one occurred.
+/// startingOID - The starting OID.
+/// endingOID   - The ending OID.
+/// error       - The error if one occurred.
 ///
 /// Returns the enumerator or nil if an error occurred.
-- (nullable GTEnumerator *)enumerateLocalCommitsInBranch:(GTBranch *)localBranch trackingBranch:(GTBranch *)trackingBranch error:(NSError **)error;
+- (nullable GTEnumerator *)enumeratorForCommitsStartingAtOID:(GTOID *)startingOID endingAtOID:(GTOID *)endingOID error:(NSError **)error;
 
 @end
 

diff --git a/ObjectiveGit/GTRepository.m b/ObjectiveGit/GTRepository.m
@@ -912,17 +912,17 @@ - (BOOL)calculateAhead:(size_t *)ahead behind:(size_t *)behind ofOID:(GTOID *)he
 	return YES;
 }
 
-- (GTEnumerator *)enumerateLocalCommitsInBranch:(GTBranch *)localBranch trackingBranch:(GTBranch *)trackingBranch error:(NSError **)error {
-	NSParameterAssert(localBranch != nil);
-	NSParameterAssert(trackingBranch != nil);
+- (nullable GTEnumerator *)enumeratorForCommitsStartingAtOID:(GTOID *)startingOID endingAtOID:(GTOID *)endingOID error:(NSError **)error {
+	NSParameterAssert(startingOID != nil);
+	NSParameterAssert(endingOID != nil);
 
 	GTEnumerator *enumerator = [[GTEnumerator alloc] initWithRepository:self error:error];
 	if (enumerator == nil) return nil;
 
-	BOOL success = [enumerator pushSHA:localBranch.OID.SHA error:error];
+	BOOL success = [enumerator pushSHA:startingOID.SHA error:error];
 	if (!success) return nil;
 
-	success = [enumerator hideSHA:trackingBranch.OID.SHA error:error];
+	success = [enumerator hideSHA:endingOID.SHA error:error];
 	if (!success) return nil;
 
 	return enumerator;