| Summary: | Cannot push merges to git.gentoo.org/proj/portage.git on prefix branch | ||
|---|---|---|---|
| Product: | Gentoo Infrastructure | Reporter: | Fabian Groffen <grobian> |
| Component: | Git | Assignee: | Gentoo Infrastructure <infra-bugs> |
| Status: | RESOLVED OBSOLETE | ||
| Severity: | normal | CC: | grobian, mgorny |
| Priority: | Normal | Keywords: | PATCH |
| Version: | unspecified | ||
| Hardware: | All | ||
| OS: | All | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
| Attachments: | Check if the commit_ts is older than some sentinel ts, and if so, don't fail the commit if missing signoff | ||
|
Description
Fabian Groffen
2018-12-06 13:28:33 UTC
ping Please give an ETA for this. I don't want to be forced to move to external infra. (In reply to Fabian Groffen from comment #1) > ping > > Please give an ETA for this. I don't want to be forced to move to external > infra. I wish you had provided slightly more information ;) You are trying to merge commits in portage.git/master to your prefix branch. The commits range from Aug. 4 to October 3. The commits are already in portage.git; but don't have a DCO because a DCO was not required at that time. We should arguably address that case in the hook. I have a patch I will provide. -A Created attachment 557330 [details, diff]
Check if the commit_ts is older than some sentinel ts, and if so, don't fail the commit if missing signoff
The actual sentinel date is of course, up for discussion. I chose this one arbitrarily.
Enumerating objects: 207, done. Counting objects: 100% (202/202), done. Delta compression using up to 3 threads Compressing objects: 100% (77/77), done. Writing objects: 100% (99/99), 31.35 KiB | 1.04 MiB/s, done. Total 99 (delta 77), reused 37 (delta 22) remote: FATAL: VREF/proj-gentoo-06-copyright: helper program exit status 256 remote: d5ed2a39f1ba4c9c67e0ec79ec18986d37a198c1: malformed sign-off (should be: real name <email>)! remote: Signed-off-by: Kewl Fft xrjy@nygb.rh.bet (rot13) remote: b84246ed16c7a2fe96075f456f64839d0536ae8f: no GCO sign-off present remote: 4ff4e4200b984a88109b10de9e82b20451751aee: no GCO sign-off present remote: ebe96286279fde6dfc989d03e5da834f0382d1a2: no GCO sign-off present remote: a90bafde1cab2db1f4d6fc65e7bf1b66df680449: no GCO sign-off present remote: 2f1c3a0e7e0e5b6d61ede0c5328ea8010881f9b5: no GCO sign-off present remote: be5877962bfdf949f887a61f03e1754286dd5ffd: no GCO sign-off present remote: efee1fa6e50aab511c42d995d2fd2f89d9cdecd6: no GCO sign-off present remote: 1f8eedc8a6d030f5a4fa204fe68b693961e5e7c3: no GCO sign-off present remote: d5f97eaa464736a454c8ad410f4acd4fccdf2324: no GCO sign-off present remote: b37256a524a0fbf88ffad20c9f01aaf37409ec66: no GCO sign-off present remote: afd0eb8b4b926f6bbb92a2a20c799ec7b528f706: no GCO sign-off present remote: 102220e1f71341e9bc85236074813f191bb389a4: no GCO sign-off present remote: 35999c9dd08b695244d4b4850dfa75bce0ad9dec: no GCO sign-off present remote: 9e1892c0b3c0e82178158bb021dca50e672b50cd: no GCO sign-off present remote: cbe6f8cac95f5db7b35018a01c56dc3d9c76bb21: no GCO sign-off present remote: 5a1528ee9b1246836c7cd066cc4506820a9a5a23: no GCO sign-off present remote: 836c5ba9352ef1fa2c14d29e8876533a9db72465: no GCO sign-off present remote: ad607b8ecfad3e099cae508ff4d3b5b62cab969f: no GCO sign-off present remote: a0d10b164038c4ef172039f5d281240c48d3611f: no GCO sign-off present remote: 1d2e1ee6ec7fd3d9a1e2713a19ef8a4f4db6ecf0: no GCO sign-off present remote: d40b9fc1f9591efab0c28fc1cbee1980dc86c735: no GCO sign-off present remote: 4673c7b0fdf1790c7d7c525fc5f59141ef224b9c: no GCO sign-off present remote: 45986341a80cfb01dad470f56f02b210b3ebf753: no GCO sign-off present remote: abf6f36a2785671f183f5f898f03c29cd5a915b9: no GCO sign-off present remote: 9f66589863e10c074c8bf652d7f9ef7631e10d61: no GCO sign-off present remote: 24d4a557cba289327b67b0d339e04995cc293020: no GCO sign-off present remote: c9cd57da216f21de49f8a57a4a692f8116d27ead: no GCO sign-off present remote: 807ac3d9d6eecead73f59d399b30559e5c731587: no GCO sign-off present remote: 04e71a831bc42f2a0de1694dd2013eac0414e007: no GCO sign-off present remote: eb81c8081ae53e862f9f0f82c6119f936ca896e7: no GCO sign-off present remote: 3f462e983b2e08107e0f7e4a2753d8deca4ac62a: no GCO sign-off present remote: 78c52aa79707756d3b816fdbfa9004f7b9dcac41: no GCO sign-off present remote: 6b4252d3a0f12808a5bcce888b7f68e1f84b5301: no GCO sign-off present remote: f391b2cc5384fc38e99a0598cb3de2346e297c25: no GCO sign-off present remote: 12aa832c91a6f2c2faee5a2e839b7f1ed5a0ee6e: no GCO sign-off present remote: error: hook declined to update refs/heads/prefix To git+ssh://git.gentoo.org/proj/portage.git ! [remote rejected] prefix -> prefix (hook declined) error: failed to push some refs to 'git+ssh://git@git.gentoo.org/proj/portage.git' commit 12aa832c91a6f2c2faee5a2e839b7f1ed5a0ee6e Author: Francesco Turco <fturco@fastmail.fm> Date: Sat Aug 4 20:47:40 2018 +0200 commit b84246ed16c7a2fe96075f456f64839d0536ae8f (tag: repoman-2.3.11) Author: Zac Medico <zmedico@gentoo.org> Date: Sat Sep 22 02:08:19 2018 -0700 What's the status here? Is the patch live yet? Can I help in some way to get this done? Alternatively, can you disable the hook temporarily for portage.git so I can push my merge and then you can ponder some more about this without me being blocked? Thanks Please ping me on IRC to sync disabling the hook. thanks, this allows me to continue here merge was done, don't expect to see more of this |
