GNOME Bugzilla – Bug 666539
errors from git hook
Last modified: 2012-03-29 15:54:18 UTC
While pushing http://git.gnome.org/browse/drgeo/log/?h=guile-2.0 there were some errors: Counting objects: 4149, done. Delta compression using up to 2 threads. Compressing objects: 100% (691/691), done. Writing objects: 100% (3898/3898), 1.52 MiB, done. Total 3898 (delta 3338), reused 3729 (delta 3205) remote: Use of uninitialized value in concatenation (.) or string at /home/admin/gitadmin-bin/ciabot.pl line 155. remote: error: Object 4b825dc642cb6eb9a060e54bf8d69288fbee4904 is a tree, not a commit To ssh://git.gnome.org/git/drgeo * [new branch] HEAD -> guile-2.0 I've seen the first error (the concatenation...) before, also when pushing into a module where the commit added the DOAP file where one didn't already exist.
Not sure the exact history here, but the problem is that the guile-2.0 branch contains a parent-less commit not in master: commit 219c7ce6c4e1baa45df98d0d2e41a8e145f38369 Author: (no author) <(no author)@6d1c95cb-ea25-0410-963c-d72b9ec7b530> Date: Thu Jun 12 22:30:51 2003 +0000 New repository initialized by cvs2svn. git-svn-id: svn+ssh://svn.gnome.org/svn/drgeo/trunk@1 6d1c95cb-ea25-0410-963c-d72b9ec7b530 It looks like maybe the branch originated from some different source other than GNOME Git and then the master branch was merged in. And ciabot.pl spits up on that, since it expects all the commits it is passed in to have a parent. Will push a fix to ciabot.pl shortly.
(In reply to comment #1) > Not sure the exact history here, but the problem is that the guile-2.0 branch > contains a parent-less commit not in master: > > commit 219c7ce6c4e1baa45df98d0d2e41a8e145f38369 > Author: (no author) <(no author)@6d1c95cb-ea25-0410-963c-d72b9ec7b530> > Date: Thu Jun 12 22:30:51 2003 +0000 > > New repository initialized by cvs2svn. > > git-svn-id: svn+ssh://svn.gnome.org/svn/drgeo/trunk@1 > 6d1c95cb-ea25-0410-963c-d72b9ec7b530 > > It looks like maybe the branch originated from some different source other than > GNOME Git and then the master branch was merged in. It did, yes. I had done this one a git-svn clone of drgeo from before gnome switched to git, and trying to rebase the branch on top of the drgeo git module didn't work, for whatever reasons. So I added my git-svn import as a remote and merged it. I guess that messed stuff up :-)