Skip to content

Add tests for single-branch but branch apply #11400

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Dec 2, 2025
Merged

Add tests for single-branch but branch apply #11400

merged 2 commits into from
Dec 2, 2025
+518 −127

Conversation

@Byron
Copy link
Collaborator

@Byron Byron commented Nov 28, 2025 •
edited
Loading

These are the things only modern code can do.

While at it, also see what happens if there is no worktree, i.e. as there is a bare repository.

Tasks

  • add single-branch test
  • make it work - needs more tests in the actual implementation
  • now find a 'simpler'/less invasive way to make this work - should be possible to detect this case, and not consider such stacks when applying (instead of not seeing them).

Road to modernization

To distribute to others

  • do the same for new/delete for good measure.
  • maybe port 'show' as well.
  • enable from-scratch journey in single-branch mode?

Follow-up of #11371

@vercel
Copy link

vercel bot commented Nov 28, 2025

@Byron is attempting to deploy a commit to the GitButler Team on Vercel.

A member of the Team first needs to authorize it.

@github-actions github-actions bot added the rust Pull requests that update Rust code label Nov 28, 2025
@Byron Byron mentioned this pull request Nov 28, 2025
Merged
7 tasks
@Byron Byron force-pushed the next2 branch 8 times, most recently from a528409 to 9aa565b Compare December 1, 2025 19:51
Byron added 2 commits December 2, 2025 08:55
@Byron
Add missing tests for apply() to be sure it works without extra met…
d95935e 
…adata.

This uncovered plenty of bugs, as we were quite dependent on the extra target before
in conjunction with out-of-workspace stacks.
@Byron
Add tests for single-branch but branch apply
63eaebe 
These are the things only modern code can do.

While at it, also see what happens if there is no worktree, i.e. as there is a bare repository.
@Byron Byron marked this pull request as ready for review December 2, 2025 08:00
@Byron Byron enabled auto-merge December 2, 2025 08:00
@Byron Byron merged commit 7d4af69 into gitbutlerapp:master Dec 2, 2025
20 of 21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

rust Pull requests that update Rust code

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@Byron