On 12/21/2018 5:51 PM, Tom Eastep wrote: > On 12/21/18 5:09 AM, Matt Darfeuille wrote: >> Tom, the follow-on patch aims to address the following issue: >> >> $ ./release 5.2.2-Beta2 >> [SNIP] >> Creating tag 5.2.2-Beta2 in /home/matt/shorewall/trunk/.git... >> Creating tag 5.2.2-Beta2 in /home/matt/shorewall/release/.git... >> Pushing branch 5.2.2 from /home/matt/shorewall/trunk/.git to origin... >> error: src refspec 5.2.2 does not match any. >> error: failed to push some refs to >> 'ssh://testbox01://srv/git/shorewall/trunk.git' >> ERROR: Failed to push branch 5.2.2 from >> /home/matt/shorewall/trunk/.git to origin. > > Thanks, Matt. >> >> >> Patch 2 will deprecate old build tools, your latest commit will stop >> modifying the created patch files when building Shorewall. >> Not modifying patch files sounds reasonable, 'cleanpatch.pl' is now >> deprecated. >> I'm incline to let 'cleanpatch.pl' in 'tools/build' for the moment, >> that way, it will be easier in case of 'revert'? > > Yes -- I plan to modify cleanpatch.pl to generate a list of manpages > whose only difference is in the generation date. That list can then be > used to replace the newly-generated manpages with the old ones so > point-release patches to manpages will apply cleanly. >
If I understand correctly, you still plan to modify the patches created by build50. If so, can't we do something in build50 or elsewhere to avoid modifying a patch file? >> >> I'm also getting: >> >> trunk$ git tag -v 5.2.2-Beta1 >> error: 5.2.2-Beta1: cannot verify a non-tag object of type commit. >> > > Yep -- the tag isn't signed, as I did the release manually. > The release script has failed at the push step, thus, after having created the tags. Why did you have to create the tags manualy? In any case, given that your using gpg, 'git tag -s' should always be used. -Matt -- Matt Darfeuille _______________________________________________ Shorewall-devel mailing list Shorewall-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/shorewall-devel
