Skip to content

Conversation

@chromy
Copy link
Contributor

@chromy chromy commented Oct 30, 2025

This resolves EME-473

Fix git_repo_base_ref previously returned a SHA where the intention of git_repo_base_ref
was to return the nice name of the default merge branch of the remote. So in the case:

    o---o---o---origin/main
   /
---1---o---o---o---foo

Where origin/main is the default merge branch we should return main.

@chromy chromy force-pushed the chromy/2025-10-29-fix-base-part-3 branch from 9ceeae7 to 6c497cd Compare October 31, 2025 10:08
@linear
Copy link

linear bot commented Oct 31, 2025

@chromy chromy marked this pull request as ready for review October 31, 2025 10:12
@chromy chromy requested review from a team and szokeasaurusrex as code owners October 31, 2025 10:12
@chromy chromy force-pushed the chromy/2025-10-29-fix-base-part-2 branch from 3827998 to 64bbabb Compare October 31, 2025 11:47
@chromy chromy requested a review from a team as a code owner October 31, 2025 11:47
@chromy chromy force-pushed the chromy/2025-10-29-fix-base-part-2 branch from 64bbabb to 629a6a8 Compare October 31, 2025 12:07
@szokeasaurusrex
Copy link
Member

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?

Base automatically changed from chromy/2025-10-29-fix-base-part-2 to master November 3, 2025 13:06
@chromy chromy force-pushed the chromy/2025-10-29-fix-base-part-3 branch from 6c497cd to c1ef39a Compare November 3, 2025 13:10
cursor[bot]

This comment was marked as outdated.

@chromy chromy force-pushed the chromy/2025-10-29-fix-base-part-3 branch 3 times, most recently from 46f6f63 to 948c09c Compare November 3, 2025 13:13
cursor[bot]

This comment was marked as outdated.

@chromy chromy force-pushed the chromy/2025-10-29-fix-base-part-3 branch from 948c09c to cd5c20a Compare November 3, 2025 13:19
@chromy
Copy link
Contributor Author

chromy commented Nov 3, 2025

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?

@szokeasaurusrex thanks! Rebased now, diff should look sensible again.

Copy link
Member

@szokeasaurusrex szokeasaurusrex left a 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]>
@chromy chromy merged commit 198d1ae into master Nov 4, 2025
26 checks passed
@chromy chromy deleted the chromy/2025-10-29-fix-base-part-3 branch November 4, 2025 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants