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.

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

av st sync when on trunk branch #363

Closed
oleg-codaio opened this issue Jul 19, 2024 · 3 comments
Closed

av st sync when on trunk branch #363

oleg-codaio opened this issue Jul 19, 2024 · 3 comments
Labels
good first issue Good for newcomers

Comments

@oleg-codaio
Copy link
Contributor

oleg-codaio commented Jul 19, 2024 •
edited
Loading

I found a few smaller issues with the sync workflow when currently on the trunk branch (main for me in my repo).

If I'm on my main branch and run av st sync, I get an error: error: current branch is not adopted to av.

If I run av st adopt, it hangs.

If I run av st sync --all, things mostly work, but av also attempts to force-push the trunk branch, which results in an error: Pushing to main directly is not allowed. because the trunk branch is protected on GitHub.
@draftcode draftcode added the good first issue Good for newcomers label Jul 22, 2024
@Brookke Brookke mentioned this issue Jul 24, 2024
Merged
aviator-app bot pushed a commit that referenced this issue Jul 26, 2024
@Brookke
feat: check if user is on trunk and prompt to sync all instead (#366)
bcc706f 
addresses: #363

<img width="493" alt="image" src="https://github.com/user-attachments/assets/ce349b93-0168-4e65-82fe-adb20585d756">
draftcode added a commit that referenced this issue Aug 6, 2024
@draftcode
Detect the branch structure in a more robust way
c281580 
This should address the issue where the stack adopt command fails when
it's invoked at the trunk branch. (#363)

Based on the feedbacks, it seems that the commit traversal is way slower
than expected. Try to be a bit more conservative when to traverse the
commits.
@draftcode draftcode mentioned this issue Aug 6, 2024
Closed
@draftcode
Copy link
Contributor

If I'm on my main branch and run av st sync, I get an error: error: current branch is not adopted to av.

This should be solved by #366. Thanks @Brookke.

If I run av st adopt, it hangs.

This will be solved by #384.

If I run av st sync --all, things mostly work, but av also attempts to force-push the trunk branch, which results in an error: Pushing to main directly is not allowed. because the trunk branch is protected on GitHub.

I'm not sure on this. This indicates that the 'main' was considered as a topic branch rather than a trunk branch. Let me file a separate issue on this. Next time this happens, please save .git/av/av.db so that we can look into the metadata.

@draftcode
Copy link
Contributor

#386 for the main being pushed problem

aviator-app bot pushed a commit that referenced this issue Aug 7, 2024
@draftcode
Use git-status to get the status of the repository (#385)(#384)
0d3ef28 
This conveniently provides the status of the repository in a structured
way. This can be used to get the current branch name (or detached
state), the OID, and all staged, unstaged, unmerged, untracked files.

Related to #374


Detect the branch structure in a more robust way
This should address the issue where the stack adopt command fails when
it's invoked at the trunk branch. (#363)

Based on the feedbacks, it seems that the commit traversal is way slower
than expected. Try to be a bit more conservative when to traverse the
commits.


Closes #384
@draftcode
Copy link
Contributor

v0.0.40 should include the fixes mentioned above. main being pushed one, please give us details if you have a reproducible setup on the issue link mentioned above. Closing this.

hugoalexmartins pushed a commit to hugoalexmartins/av that referenced this issue Oct 29, 2024
@draftcode
Detect the branch structure in a more robust way
f3d9f76 
This should address the issue where the stack adopt command fails when
it's invoked at the trunk branch. (aviator-co#363)

Based on the feedbacks, it seems that the commit traversal is way slower
than expected. Try to be a bit more conservative when to traverse the
commits.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
good first issue Good for newcomers
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@draftcode @oleg-codaio