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

[ci skip] Changing the order of the rebase with autosquash command in the contributing.md #6974

Merged
merged 1 commit into from Jun 3, 2022

Conversation

mja00
Copy link
Contributor

@mja00 mja00 commented Dec 1, 2021

I was attempting to edit an older patch to get the feel for doing so as I want to eventually assist with fixing bugs/creating new features. I ran into some weirdness when trying to rebuild my patches and that boiled down to the command listed for rebasing with autosquash here acting weird on Windows(and maybe other systems).

When rebasing using the command provided there I was ending up with Spigot patches in the end after rebuilding them. I posted in paper-dev and MM pointed out that it'd be caused by not rebasing with the base. Apparently, the order of the arguments needs to be quite specific otherwise it doesn't actually rebase using that tag. I tried changing the order to git rebase -i --autosquash base as told by MM and it worked properly and was only rebuilding Paper patches.

Not too sure why it wasn't working properly but I thought of making a PR to update the contributing guide in case anyone else runs into that issue as it looks like the order doesn't affect Linux at all.

Thanks and I hope to make more PRs in the future :D

Windows(I know) seems to freak out when using the command git rebase --autosquash -i base as I was getting all of Spigot's patches when rebuilding them, swapping the arguments around fixed that issue.
@mja00 mja00 requested a review from as a code owner Dec 1, 2021
@mja00 mja00 changed the title Changing the order of the rebase with autosquash in the contributing.md Changing the order of the rebase with autosquash command in the contributing.md Dec 1, 2021
@Machine-Maker
Copy link
Member

@Machine-Maker Machine-Maker commented Dec 1, 2021

Does this make a difference on all git platforms or just git for windows? I totally assumed they were interchangeable

@mja00
Copy link
Contributor Author

@mja00 mja00 commented Dec 1, 2021

Not too sure, all I know is on Windows it wasn't taking the base tag because I was getting Spigot patches. I can give it a test on my MacBook to see if it's weird there too.

@mja00
Copy link
Contributor Author

@mja00 mja00 commented Dec 1, 2021

Order doesn't matter on my MacBook, rebuilds the patches fine either order. Looks like it might be a git for windows thing which honestly doesn't shock me.

If you want I can change it to something like "Use X command if you're using git for windows". Though since it appears neither arrangement matters for unix based systems probably just having it in the format that makes windows happy would be fine. Up to y'all.

@stale
Copy link

@stale stale bot commented Jan 30, 2022

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@Chew Chew added status: accepted and removed resolution: stale labels Jan 30, 2022
Copy link
Contributor

@NoahvdAa NoahvdAa left a comment

Add [ci skip] to the start of the title (can also be handled by merger ofc)

@electronicboy
Copy link
Member

@electronicboy electronicboy commented Jun 3, 2022

Windows.... This should probably be reported to them if it's not already, but, bleh

@electronicboy electronicboy changed the title Changing the order of the rebase with autosquash command in the contributing.md [ci skip] Changing the order of the rebase with autosquash command in the contributing.md Jun 3, 2022
@electronicboy electronicboy merged commit 4d83ed0 into PaperMC:master Jun 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: accepted
Projects
Status: Merged
Development

Successfully merging this pull request may close these issues.

None yet

6 participants