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

Adds stack sync command #166

Merged
merged 68 commits into from
Dec 30, 2024
Merged

Adds stack sync command #166

merged 68 commits into from
Dec 30, 2024

Conversation

geofflamrock
Copy link
Owner

@geofflamrock geofflamrock commented Dec 30, 2024 •
edited
Loading

Background

This PR is part of a series that separates commands that operate on the local Git repository from those that operate against the remote. This is to help align the tool to the way that Git itself operates.

Changes

This PR adds a new command stack sync which:

  • Fetches changes from the remote repository with git fetch --prune
  • Pulls changes from the remote for the selected stack
  • Updates the stack
  • Pushes changes to the remote for the selected stack

@geofflamrock
Show local status by default in status command
215b859
@geofflamrock
Make showing status much better and quicker
8084392
@geofflamrock
Remove --minimal option for now
b30c303
@geofflamrock
Separate git branch status parsing
1b318b6
@geofflamrock
Revert change to detecting remote branches for other commands
24e37be
@geofflamrock
Cleanup
4410d0b
@geofflamrock
Adds pull command
369aba4
@geofflamrock
Tiny improvement to output when getting status of single stack
bba932f
@geofflamrock
wip pull tests
6b573fb
@geofflamrock
Add more tests
1925602
@geofflamrock
Merge branch 'main' into stack-status-local-by-default
e0f25ec
@geofflamrock
Merge branch 'stack-status-local-by-default' into add-pull-command
785d5cd
@geofflamrock
Improve getting tip of remote branch
4df13a8
@geofflamrock
Adds push command
e95e5cb
@geofflamrock
Add formatting
734fae3
@geofflamrock
Testing out capturing std err
d167733
@geofflamrock
Make std err optional
3254a3a
@geofflamrock
Merge branch 'main' into stack-status-local-by-default
4b00fa2
@geofflamrock
Merge branch 'stack-status-local-by-default' into add-pull-command
294c403
@geofflamrock
Merge branch 'add-pull-command' into add-push-command
9bcc789
@geofflamrock
Make formatting less noisy
e5f81ec
@geofflamrock
Merge branch 'stack-status-local-by-default' into add-pull-command
0d2ad4e
@geofflamrock
Merge branch 'add-pull-command' into add-push-command
99fea49
@geofflamrock
Add tests
9a1c158
@geofflamrock
Push new branch if required
2f543b0
@geofflamrock
Adds --no-push option to new stack creation
1d953e2
@geofflamrock
Add --push option to new branch creation
f8295da 
Change to --push for new stack creation
@geofflamrock
Update help
b1eac2e
@geofflamrock
Update help and readme
a0a8d7d
@geofflamrock
Update help
1ce8196
This was referenced Dec 30, 2024
Merged
Merged
Merged
@geofflamrock geofflamrock changed the title Adds sync command Adds stack sync command Dec 30, 2024
@geofflamrock geofflamrock added the minor Increment the minor version when merged label Dec 30, 2024
Base automatically changed from add-push-option-to-new-branch to main December 30, 2024 11:50
@geofflamrock geofflamrock merged commit bb81640 into main Dec 30, 2024
17 checks passed
@geofflamrock geofflamrock deleted the add-sync-command branch December 30, 2024 12:05
@gha-automation-personal gha-automation-personal bot mentioned this pull request Dec 30, 2024
Open
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
minor Increment the minor version when merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@geofflamrock