On 05/14/2012 12:38 PM, Sean Bruno wrote:
On Thu, 2012-05-10 at 17:53 -0700, Laine Stump wrote:
> On 05/10/2012 08:07 PM, Sean Bruno wrote:
>> So, Hiren and I are approaching our first milestone, where we think that
>> we're feature complete for freebsd. We're working out a few details at
>> the moment, but its starting to look good.
>>
>> In order for you guys to pull from us, what's the standard process for
>> us to follow such that you can review, accept(and/or reject) and pull
>> from our tree.
>>
>> I assume there's some kind of "generate review-able patches"
guidelines
>> we should follow to make your lives easy.
> Pretty simple, really - just make sure your patches are on a local git
> branch that's based off the fedorahosted master branch, and use git
> send-email --compose -<# of patches>, giving the introductory message
> the subject [PATCH 0/<# of patches>] <something descriptive> and a short
> overview.
>
> A series of small patches is much better than a single monolithic patch.
> Especially - if you've done any refactoring of the existing code to make
> your code fit in better, it would be better to put that first in a
> separate patch (such that applying it would have 0 functional effect),
> then your port-specific stuff in later patches.
>
> ______________________________________
Since my git-foo is pretty weak, I'm pretty conservative here.
Should I branch another copy of the the project repo (yours) and apply
patches from our repo to the new copy and then send the patches from
that via git-send-email()?
If, when you say "our repo", you mean a git repo that was initially
based from ours, then you can directly do git send-email from that.
Otherwise, here's a full synopsis of the steps that would give you
patches in the right format, while not messing up the "master" branch of
a checkout from the main repo:
git clone
git://git.fedorahosted.org/netcf.git
cd netcf
git checkout -b mybranch
(make changes)
git add [modified files]
git commit (with useful commit log message)
[repeat steps 4-6 as needed]
git send email --compose -<number of patches>
(this way, you can later "git checkout master && git pull")