Re: Broken commits in our repo
On Sun, 2012-11-18 at 18:32 -0600, Norbert Thiebaud wrote: 1/ this is harmless 2/ this certainly is not worth the extreme pain of a git-rewrite Agreed - we have very significant annotations of specific git hashes left and right to double-check the re-basing work; anything that hinders that process in the next months is incredibly under-appreciated. So - if it's just a few harmless warnings - we should leave it for now. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Broken commits in our repo
Agreed - we have very significant annotations of specific git hashes left and right to double-check the re-basing work; anything that hinders that process in the next months is incredibly under-appreciated. So - if it's just a few harmless warnings - we should leave it for now. Well, technically, they're quite harmless (normal git operations still work fine), but certain git hosters (at least github) refuse uploading. cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Broken commits in our repo
Hi folks, while trying to push to github, I've encountered trouble with broken commits: github always runs fsck on post-receive, which fails due to broken commit metadata, and upload will be rejected. See commit 144c7a2e1d711e13422a5c84b34ac33b1d940034 Optimally, we should correct this, but unfortunately that would would conflict existing tags. So how can we do that ? My idea would be writing some git-filter-branch based script which runs through all branches and tags and stores the new ones with some suffix, eg. .FILTERED, additionally add the old ones (which have been rewritten) with suffix .BACKUP. Then we would rename the (active) filtered branches to the official names (eg. master.FILTERED to master) and rebase the unfiltered ones ontop the filtered ones in case of someting was forgotten. The really tricky point is concurrent writes: we need some maintenance downtime window where no new pushes are allowed, so nothing gets lost in the process. When everything's done, we'd do an announcement that people should drop their copies of the tags (and do necessary steps for potentially _local_ tags) and rebase their downstream branches. What do you think about this ? cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Broken commits in our repo
On Sun, Nov 18, 2012 at 10:24 AM, Enrico Weigelt enrico.weig...@vnc.biz wrote: Hi folks, while trying to push to github, I've encountered trouble with broken commits: github always runs fsck on post-receive, which fails due to broken commit metadata, and upload will be rejected. See commit 144c7a2e1d711e13422a5c84b34ac33b1d940034 The problem is that fdo is not a symetric mirror of gerrit. it contains more stuff... either stuff that was left behind during the initial setup of gerrit's core repo or stuff that was later deleted from core and the deletion is not propagated to fdo The reason for the later was to be able to catch branches that were mistakenly not migrated to gerrit. If you found such branch, let us know which branch it is and we'll see how to correct the situation... but the corection will be either: 1/ ignore it because it is not a branch we care about anymore 2/ re-establish that branch (and the commit associated) in he gerrit version of core. In general you want to make sure to base close on gerrit and not on fdo Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Broken commits in our repo
snip Did a little bit more research: git fsck on a fresh clone spits out long list of broken commit errors: (far more than 50 lines) error in commit edc18425b8c2455c5f0d172126156d90e7c06eb2: invalid author/committer line - missing space before email error in commit 10ab5aa3953d58f3430819a990250741aff25d4e: invalid author/committer line - missing space before email error in commit d76f5aa618f4484b97e9c3846d8fc6d717a306bb: invalid author/committer line - missing space before email error in commit d73c47726d83afc4196c49f6e2cd4d7f2f435637: invalid author/committer line - missing space before email error in commit 41c42f2d98dd50a95268dc1091f6c8e21c3e6667: invalid author/committer line - missing space before email error in commit 436416a6320037855846fce127a0cfa77ac45270: invalid author/committer line - missing space before email error in commit 11ce307732218d59f8132eb0a0fb4b08a4048c3f: invalid author/committer line - missing space before email error in commit 5ad79ff63008de36accc910d474f2e85b4d8d9e1: invalid author/committer line - missing space before email Inspecting a few of them showed up, they're not commits at all, but tree objects. cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Broken commits in our repo
On Sun, Nov 18, 2012 at 4:34 PM, Enrico Weigelt enrico.weig...@vnc.biz wrote: snip Did a little bit more research: git fsck on a fresh clone spits out long list of broken commit errors: (far more than 50 lines) error in commit edc18425b8c2455c5f0d172126156d90e7c06eb2: invalid author/committer line - missing space before email $ git cat-file -p edc18425b8c2455c5f0d172126156d90e7c06eb2 tree 706ac10fbe9afecbe294b6d021500804223845b6 parent d73c47726d83afc4196c49f6e2cd4d7f2f435637 author Andre Fischerandre.f.fischer Andre Fischerandre.f.fisc...@oracle.com 1279813514 +0200 committer Andre Fischerandre.f.fischer Andre Fischerandre.f.fisc...@oracle.com 1279813514 +0200 renaissance1: #i107215# Replaced unhide text button by icon button. So no, it is not a tree but indeed a commit... and the 'problem' is that the email fo the committer is bad.. that came from a poor email config or so hg-to-git or svn-to-git conversion issue in any case: 1/ this is harmless 2/ this certainly is not worth the extreme pain of a git-rewrite Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
