search

getsolus / packages

Solus Package Monorepo & Issue Tracker
54 stars 68 forks source link

git pre-commit hooks: --amend and --fixup causes issues currently #2127

Open ermo opened 3 months ago

ermo commented 3 months ago

stigarn Hi, is there any way to get pas this error? I'm editing a commit I made and I amended it so now it won't accept my new commit. It is this one https://github.com/getsolus/packages/pull/2108

WRN packages/q/qqwing/package.yml:1: Package release is not incremented by 1 ERR packages/q/qqwing/pspec_x86_64.xml:1: Package release is not incremented by 1 Package checks failed: /home/jakob/solus-packages/common/CI/package_checks.py packages/q/qqwing/package.yml packages/q/qqwing/pspec_x86_64.xml qqwing: include homepage by androidnisse · Pull Request #2108 · getsolus/packages David Harder you must not be amending the commit then, you're creating a new one git commit --no-verify should bypass the checks. But usually the checks are trying to tell you something stigarn yea im using git commit --amend and still got that but good to know about the other command Joey Riches oh i got that earlier with git commit --fixup as well so the checks aren't working as intended there it seems ermo Silke: ^ potential issue with how we compare historical commits against current one? it could be that previous commit has rel identical to current commit somehow (given how the checks work) i.e. that previous commit hash is not actually "forgotten" so that hash has same relno as current hash and triggers the logic? Silke I think this is probably the pre-commit-hook, which operates on the staged changes. That wouldn't work with fixups and probably does strange things on amend ermo What might a good next step be here...? in terms of expanding the use cases for the hooks to cover this scenario in a useful way I mean? Silke Probably detect what kind of commit it is and do smart things. ermo Difficulty level of this? Silke Not sure, probably not that difficult. Not sure about the amend, but the fixup has a clear prefix on the commit at least. But doing --no-verify when doing --amend or --fixup is a good workaround for now ermo Are we creating an issue for this that the PR with the hook update can be linked to...? or how would you prefer to play it? Silke

ermo Are we creating an issue for this that the PR with the hook update can be linked to...?

Yes please

TraceyC77 commented 3 months ago

There's also an open issue for problems with cherry picking