-
-
Notifications
You must be signed in to change notification settings - Fork 234
fix(vcs): Make git_repo_base_ref return ref #2898
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
9ceeae7 to
6c497cd
Compare
3827998 to
64bbabb
Compare
64bbabb to
629a6a8
Compare
|
Hey @chromy — something with this PR looks off; seems like changes from multiple PRs are showing here. Can you rebase/update the branch, so that I only see the changes that I need to review here? |
6c497cd to
c1ef39a
Compare
46f6f63 to
948c09c
Compare
948c09c to
cd5c20a
Compare
@szokeasaurusrex thanks! Rebased now, diff should look sensible again. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, just one minor suggestion to consider prior to merging
Co-authored-by: Daniel Szoke <[email protected]>
This resolves EME-473
Fix
git_repo_base_refpreviously returned a SHA where the intention ofgit_repo_base_refwas to return the nice name of the default merge branch of the remote. So in the case:
Where
origin/mainis the default merge branch we should returnmain.