Commit.getParents working with merge commits#357
Merged
johnhaley81 merged 1 commit intonodegit:masternodegit/nodegit:masterfrom Jan 19, 2015
bjornarg:get-multiple-parentsbjornarg/nodegit:get-multiple-parentsCopy head branch name to clipboard
Merged
Commit.getParents working with merge commits#357johnhaley81 merged 1 commit intonodegit:masternodegit/nodegit:masterfrom bjornarg:get-multiple-parentsbjornarg/nodegit:get-multiple-parentsCopy head branch name to clipboard
johnhaley81 merged 1 commit intonodegit:masternodegit/nodegit:masterfrom
bjornarg:get-multiple-parentsbjornarg/nodegit:get-multiple-parentsCopy head branch name to clipboard
Conversation
Member
|
Awesome thank you @bjornarg! |
Collaborator
|
Re-queued this to test on AppVeyor. If it passes I'll go ahead and merge it in. |
Collaborator
|
Ok so it didn't try to do a merge with the latest on master. @bjornarg could you rebase this commit on the latest in master please and then we can go ahead and merge after tests pass. Thanks! |
getParents failed when more than one commit was present, since it attempted to get the second parent of commit's parent instead of it's own second parent. The promise for the second parent was also pushed onto the array for Promise.all() too late to actually have an effect. Limit was not working properly as a limit, since it attempted to retrieve the set limit regardless of how many parents a commit had, failing if the limit was set to more than Commit.parentcount().
Contributor
Author
|
@johnhaley81 You want me to force-push a rebase? |
30ab7c8 to
00a62f8
Compare
Contributor
Author
|
Well, seems like travis is having trouble now... :) |
Collaborator
|
Yeah go ahead and rebase and force push, and we'll bring it in upon test pass. We've been having a few hiccups with builds just randomly stalling today, but it all seems resolved (knock on wood). |
Collaborator
|
All tests passed, thanks for the PR @bjornarg! |
johnhaley81
added a commit
that referenced
this pull request
Jan 19, 2015
Commit.getParents working with merge commits
Collaborator
|
👍 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
getParents failed when more than one commit was present, since it attempted
to get the second parent of commit's parent instead of it's own second
parent.
The promise for the second parent was also pushed onto the array for
Promise.all() too late to actually have an effect.
Limit was not working properly as a limit, since it attempted to
retrieve the set limit regardless of how many parents a commit had,
failing if the limit was set to more than Commit.parentcount().