GIT development branches for packagers?

David Tardon dtardon at redhat.com
Wed Jan 15 07:56:25 UTC 2014


Hi,

On Tue, Jan 14, 2014 at 12:41:42PM -0800, Andrew Lutomirski wrote:
> I have some trivial cleanups I want to make to a package a maintain.
> These cleanups are trivial enough that I don't think they're worth a
> new build.  Should I commit them to the master branch?
> 
> The normal GIT approach would be to develop on another branch and to
> merge when I want to build a new revision (the Fedora equivalent of
> tagging a new release).  Should Fedora provide branches like
> master-devel, f20-devel, etc that store pending changes?

You already have that "branch": it is your local repo :-) Nobody forces
you to push your changes before you are ready to do a build. And you can
use remote branches as well; you just need to pass --dist XY to fedpkg
for all operations, as it will not be able to recognize the release from
your branch name. E.g.:

git checkout -b f20-devel
git push origin f20-devel:f20-devel
# ... changes ...
fedpkg --dist f20 local
# ... check it builds ...
git commit -am '...'
git push

D.


More information about the devel mailing list