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 #522 #525

Closed
wants to merge 2 commits into from
Closed

fix #522 #525

wants to merge 2 commits into from

Conversation

Byron
Copy link
Contributor

@Byron Byron commented Jan 13, 2025

This PR fixes #522.

Tasks

  • Use latest gix API to find the remote and upstream by reverse-refspec mapping
  • Use latest published gix to avoid Git dependency

@jpgrayson
Copy link
Collaborator

Thank you for digging into this @Byron. The changes here on the StGit end look pretty straightforward. I see that the accompanying changes on the gitoxide side of things are more extensive. Nice work!

When the upstream changes land in a gitoxide release, I'll plan on incorporating these StGit changes.

@Byron Byron marked this pull request as ready for review January 18, 2025 16:07
@Byron
Copy link
Contributor Author

Byron commented Jan 18, 2025

Thank you!

And that's fantastic timing too as I happen to have a new release handy now.
Will resolve the merge conflict real quick, then it's ready.

Byron added 2 commits January 18, 2025 17:09
…-git#522)

Previously assumptions were made about how shortened tracking branches
would relate to remote names, and partial names would be set as `merge` field
of local branch configuration. The latter could lead to Git being unable
to perform certain operations.

Now the correct full reference name is set.
@jpgrayson
Copy link
Collaborator

Hi @Byron. I've reduced the whitespace changes to Cargo.toml in your first commit and then pushed those commits manually. Closing this PR accordingly.

I also tried out these changes and they seem great. Thank you again for all the support you've given the Stacked Git project!

@jpgrayson jpgrayson closed this Jan 18, 2025
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.

stg branch --create sets up remote tracking information incorrectly
2 participants