On 08.01.25 21:28, Matthias Bläsing wrote:
Hi Chris,
Am Mittwoch, dem 08.01.2025 um 21:11 +0100 schrieb Chris:
Thx for the headsup. I know that pain but I thought that this is just
the button "squash and merge" at github, isn't it?
On 08.01.25 17:34, Matthias Bläsing wrote:
Cleaningup with git is not that hard:
- If there are merges from master, rebase the changeset onto master
- Then use the interactive rebase feature of git to cleanup the commits
as necessary. Commits can be reordered and squashed together.
- Then force-push into the original PR branch
that button is disable for the Apache NetBeans repository. The reason
is, that github managed to break that feature.
The behavior of the git CLI client is, that it keeps the author
information intact/takes it from one of the squashed commits and makes
the rebasing user the committer (that are two different fields in git
commits).
The github GUI in the past randomly removed user names and email
information. If I understand it correctly it depends on the settings of
the affected user whether he makes its realname and/or emails visible.
Have a look at the output of
git log -n 1 --pretty=fuller b080e1ec9bfaaa552c78146496b798fac2770b66
That is a recent merge commit created by github. The authors name is
listed, the email part is replaced by an github pseudonym.
We also had situations where users hid their realname.
Worth noting that our commit header checker script which we added after
https://lists.apache.org/thread/rb09p94qwl4z0tw040f12053qbobnp72
should pick up many author/mail issues now and fail the paperwork job.
(and also some other things like empty commit messages). #6630 has some
screenshots.
Not sure if we can make it more strickt without it getting in the way
though.
So essentially i am out of ideas at this point - nothing will replace
reviewers who point out issues with a PR before hitting approve and/or
committers who go through the checklist before merge.
-mbien
Greetings
Matthias
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@netbeans.apache.org
For additional commands, e-mail: dev-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@netbeans.apache.org
For additional commands, e-mail: dev-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
