GNOME Bugzilla – Bug 636088
errors from gnome-post-receive-email
Last modified: 2012-03-05 20:38:17 UTC
background: I wanted to release a libsoup 2.32.2 along with 2.91.3, but then I realized that they would be completely identical other than version number, so I decided to just erase the old gnome-2-32 branch and rebranch from HEAD. danw@desktop:libsoup (master)> git push origin :gnome-2-32 To ssh://git.gnome.org/git/libsoup - [deleted] gnome-2-32 danw@desktop:libsoup (master)> git checkout -b gnome-2-32 Switched to a new branch 'gnome-2-32' danw@desktop:libsoup (gnome-2-32)> git checkout master Switched to branch 'master' Your branch is ahead of 'origin/master' by 3 commits. danw@desktop:libsoup (master)> git push --tags origin master gnome-2-32 Counting objects: 23, done. Delta compression using up to 2 threads. Compressing objects: 100% (15/15), done. Writing objects: 100% (15/15), 3.14 KiB, done. Total 15 (delta 11), reused 0 (delta 0) Traceback (most recent call last):
+ Trace 224902
main()
change.prepare()
detailed_commit_args.append("^" + all_changes[branch].oldrev)
To ssh://git.gnome.org/git/libsoup 81d7447..e270b78 master -> master * [new branch] gnome-2-32 -> gnome-2-32 * [new tag] LIBSOUP_2_32_2 -> LIBSOUP_2_32_2 danw@desktop:libsoup (master)>
Just got hit by this while creating eog's gnome-3-2 branch: $ git push origin master gnome-3-2 Counting objects: 25, done. Delta compression using up to 2 threads. Compressing objects: 100% (17/17), done. Writing objects: 100% (17/17), 4.03 KiB, done. Total 17 (delta 13), reused 0 (delta 0) remote: Traceback (most recent call last): remote: File "/home/admin/gitadmin-bin/gnome-post-receive-email", line 906, in ? remote: main() remote: File "/home/admin/gitadmin-bin/gnome-post-receive-email", line 901, in main remote: change.prepare() remote: File "/home/admin/gitadmin-bin/gnome-post-receive-email", line 221, in prepare remote: detailed_commit_args.append("^" + all_changes[branch].oldrev) remote: TypeError: cannot concatenate 'str' and 'NoneType' objects To ssh://git.gnome.org/git/eog abe2d40..81acc92 master -> master * [new branch] gnome-3-2 -> gnome-3-2 Maybe this occurs when the new branch is not created at the top of the old master (gnome-3-2 was simply created at HEAD~2 in this case)?
Problem was actually mixing together a branch creation and changes to the master branch - the logic for excluding already-emailed commits was blowing up.