Skip to content
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

fix(graph): Ensure local master moves to upstream #373

Merged
merged 3 commits into from
Nov 30, 2024
Merged

Conversation

epage
Copy link
Collaborator

@epage epage commented Nov 30, 2024

Repeatedly, the local master doesn't get moved. This seems to fix it.

  • We weren't checking for branches on the starting commit and sometimes we start on the new master
  • When on a branch commit, we weren't correctly walking children because we were talking about "primary" when there isn't always a primary commit

I'm a bit unsure on that last one. Hope this doesn't break more

@epage epage enabled auto-merge November 30, 2024 18:37
@epage epage merged commit db1818d into gitext-rs:main Nov 30, 2024
14 checks passed
@epage epage deleted the fix branch November 30, 2024 18:39
@coveralls
Copy link

Pull Request Test Coverage Report for Build 12098640664

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

Details

  • 16 of 17 (94.12%) changed or added relevant lines in 2 files are covered.
  • 5 unchanged lines in 4 files lost coverage.
  • Overall coverage decreased (-0.06%) to 29.333%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/graph/ops.rs 15 16 93.75%
Files with Coverage Reduction New Missed Lines %
src/legacy/git/repo.rs 1 45.84%
src/legacy/git/commands.rs 1 58.75%
src/git/repo.rs 1 44.48%
src/rewrite/mod.rs 2 47.55%
Totals Coverage Status
Change from base Build 11630847827: -0.06%
Covered Lines: 1640
Relevant Lines: 5591

💛 - Coveralls

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.

2 participants