Skip to content

[howdy-beta] Rebase to d3ab993#5

Merged
principis merged 1 commit into
principis:mainfrom
ykshek:main
Jul 14, 2025
Merged

[howdy-beta] Rebase to d3ab993#5
principis merged 1 commit into
principis:mainfrom
ykshek:main

Conversation

@ykshek
Copy link
Copy Markdown
Contributor

@ykshek ykshek commented Jun 24, 2025

  1. Rebased to d3ab99382f88f043d15f15c1450ab69433892a1c
  2. Removed polkit patch from 3.0.0-2 as that is now merged in Release 3.0.0 boltgolt/howdy#1023,
  3. Moved "fix python path" to meson, due to Remove use of Environment Python boltgolt/howdy#904 being merged in Release 3.0.0 boltgolt/howdy#1023

@ykshek
Copy link
Copy Markdown
Contributor Author

ykshek commented Jun 24, 2025

Only the last two are important, the other commits are just a result of me trying to get things working without actually knowing how things work

@principis
Copy link
Copy Markdown
Owner

Only the last two are important, the other commits are just a result of me trying to get things working without actually knowing how things work

When that happens, you should amend commits, or squash them. See Rewriting history.

Please squash to a single commit and make sure the commit message is clear. E.g:

howdy-beta: update to d3ab99382f88f043d15f15c1450ab69433892a1c

@ykshek
Copy link
Copy Markdown
Contributor Author

ykshek commented Jun 25, 2025

My bad, will edit that out tomorrow ended up fixing it immediately - technically it did pass 00:00 here so I guess that counts

@principis principis changed the title Rebase to d3ab993 [howdy-beta] Rebase to d3ab993 Jun 25, 2025
@ykshek
Copy link
Copy Markdown
Contributor Author

ykshek commented Jun 25, 2025

Oh boy what have I done

@ykshek
Copy link
Copy Markdown
Contributor Author

ykshek commented Jun 25, 2025

Do you mind if I just close this pull request and use the new one I just created?
I shall learn how to do it

@principis
Copy link
Copy Markdown
Owner

principis commented Jun 25, 2025

Do you mind if I just close this pull request and use the new one I just created?

No, please update this PR.

You can squash the commits by rebasing as in the manual I linked previously. Change the commit message or a commit with git commit --amend.
Make sure it's from the main branch otherwise you can't update this PR. Usually you should create a new branch, commit your changes and make a PR, but let's keep it for now.

@ykshek
Copy link
Copy Markdown
Contributor Author

ykshek commented Jun 25, 2025

Alright, should be all fixed now!

@principis
Copy link
Copy Markdown
Owner

great, thank you!

I noticed you signed your commits previously. The current one isn't. If you want to resign them you can do that as follows:

git commit --amend --no-edit -S
git push --force

Amending a commit with -S won't sign it anymore. There may be some configuration somewhere to do this automatically, but I'm not aware of any.

I want to build and check some things before merging. I'll do that tonight.

@ykshek
Copy link
Copy Markdown
Contributor Author

ykshek commented Jun 27, 2025

Ah, the previous commit was done on the github website editor, that's why it was automatically signed. I couldn't sign it because I simply don't have a key to sign the commit with. The commit became no longer signed since I amended and forced pushed them.

I think I'll just leave it unsigned :P

1. Rebase to d3ab993
2. Removed polkit patch from 3.0.0-2 as that is now merged,
3. Delete howdy-beta/0001-fix-polkit.patch
4. Moved "fix python path" to meson
@ykshek
Copy link
Copy Markdown
Contributor Author

ykshek commented Jul 11, 2025

Finally got around to setting up the keys and signing it, apologies for the long wait!

@principis
Copy link
Copy Markdown
Owner

No worries, I was just a bit too busy to look into it!

Thanks for your work 🙂

@principis principis merged commit bbcd511 into principis:main Jul 14, 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.

2 participants