Skip to content

Conversation

@techknowlogick
Copy link
Member

This would allow developers to keep a local file that'd add personal makefile targets for niche convenience customization without having to have the git workspace polluted with uncommitted changes.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 3, 2025
@techknowlogick techknowlogick added skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. backport/v1.25 and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Nov 3, 2025
Copy link

@charles25565 charles25565 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe the grammar could be improved.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 3, 2025
Signed-off-by: techknowlogick <techknowlogick@gitea.com>
@techknowlogick
Copy link
Member Author

@charles25565 if you have a suggestion I'd be more than happy to update the comment (or PR title). I agree that it is not as straightforward as could be. :)

@silverwind
Copy link
Member

silverwind commented Nov 3, 2025

My only problem is this filename, it's not recognized by linguist for example. Maybe we can find a filename that is or contribute Makefile.local to linguist?

@charles25565
Copy link

charles25565 commented Nov 3, 2025

@charles25565 if you have a suggestion I'd be more than happy to update the comment (or PR title). I agree that it is not as straightforward as could be. :)

Strings should be:

-# a makefile for personal convenience make targets
+# A Makefile for custom make targets
-# Include local personalizations
-# Makefile.local is gitignored
+# Include local Makefile
+# Makefile.local is listed in .gitignore

@charles25565
Copy link

My only problem is this filename, it's not recognized by linguist for example. Maybe we can find a filename that is or contribute Makefile.local to linguist?

It can also be done using .gitattributes.

@silverwind
Copy link
Member

Yes, if the filename stays, add Makefile.* linguist-language=Makefile to .gitattributes.

@techknowlogick
Copy link
Member Author

Thanks @charles25565 and @silverwind :) Your feedback was most helpful. I've updated the PR with the changes.

@lunny
Copy link
Member

lunny commented Nov 4, 2025

I couldn't find the reason to backport this PR.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Nov 4, 2025
@techknowlogick
Copy link
Member Author

@lunny I had the PR marked as backport, so that when switching to an older branch the Customized makefile wouldn't be accidentally included in a commit

@GiteaBot GiteaBot removed the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Nov 8, 2025
@GiteaBot GiteaBot added the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Nov 8, 2025
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 8, 2025
@denyskon denyskon enabled auto-merge (squash) November 8, 2025 19:20
@denyskon denyskon merged commit 9193486 into go-gitea:main Nov 8, 2025
25 checks passed
@GiteaBot GiteaBot added this to the 1.26.0 milestone Nov 8, 2025
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/v1.25 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/internal skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants