Move FindMergeBase() overloads to ObjectDatabase#957
Move FindMergeBase() overloads to ObjectDatabase#957nulltoken merged 1 commit intolibgit2:vNextfrom bording:moveFindMergeBase
Conversation
|
There were a couple things I wasn't completely sure about:
I fixed up all the tests that broke when I made these changes, but I didn't add any new ones because I was assuming getting the existing tests working again would be sufficient. |
LibGit2Sharp/IQueryableCommitLog.cs
Outdated
There was a problem hiding this comment.
Ooooh.... A newline sneaked in here 👹 
|
@bording Congrats on your first PR! That looks like a amazing work to me. I you feel like amending your commit and force pushing to drop the newline, that'd be perfect. Otherwise, I'm happy to merge it as is. We'll clean this later. |
|
Ack, not sure how I missed that extra newline! :) I don't mind amending the commit and getting rid of it. I also noticed that there have been some commits to vNext that are ahead of my branch. Would you prefer I leave my branch where it is, or should I go ahead and rebase to the new vNext? |
|
@bording Wow. You're aklready a git ninja! Awesome. Rebasing would be better as it tends to make the history easier to understand. |
Per isssues #864 and #951, the overloads of FindMergeBase() have been moved from CommitLog to ObjectDatabase. The methods on ICommitLog and CommitLog have been deprecated, and calls to the CommitLog methods have been changed to call the ObjectDatabase versions instead. The relevant tests have been updated as well. Fixes #864 #951
|
There you go, newline removed and rebased to latest vNext! I tend to prefer rebasing when possible, because I hate seeing merge commits in the history. I'm usually using gitk --all and it makes things way more complicated! |
|
@bording ✨ ✨ ✨ |
|
Published in prerelease NuGet package |
2 participants
Per isssues #864 and #951, the overloads of FindMergeBase() have been moved
from CommitLog to ObjectDatabase.
The methods on ICommitLog and CommitLog have been deprecated, and calls to
the CommitLog methods have been changed to call the ObjectDatabase versions
instead.
The relevant tests have been updated as well.