Leo Famulari <l...@famulari.name> writes: > On Thu, Aug 04, 2016 at 02:40:32PM +0200, Andreas Enge wrote: >> On Thu, Aug 04, 2016 at 08:36:28AM -0400, Mark H Weaver wrote: >> Good news, thanks for all this work! > > Indeed! > >> > Unfortunately, when I tried to push it to 'master', it was rejected >> > because of 56 unsigned commits on the 'core-updates' branch. Note that >> > all of the new commits I made (the reverts, the merge, and the >> > cherry-picks) were all signed by me. The unsigned commits that are >> > blocking this have been on the 'core-updates' branch for quite some >> > time. >> > >> > If there are unsigned commits on 'core-updates-next', I guess we'll run >> > into the same problem trying to merge that branch later. > > Yes, I had this problem yesterday. > >> A possible solution would be to disable the commit hook that forces >> signatures, make these commits, and reenable the hook; hoping that noone >> adds an unsigned commit in the meantime... It would require to coordinate >> with a savannah administrator. > > I think we have to do this, unfortunately.
I just did this. Huge thanks to Lisa Marie Maginnis, GNU sysadmin extraordinaire, for promptly responding to my plea for help :) However, we should take steps to avoid this problem in the future. The most recent unsigned commit on 'core-updates' was from only 3 days ago, by Andreas. "gnu: unison: Add input ghostscript". I'm fairly sure this was after we added the commit hook, so I guess the hook only applies to 'master'. So, if I understand correctly, we're currently in a state where unsigned commits can accidentally get pushed to other branches, making those branches unmergeable into 'master'. Mark