Commit process

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

Commit process

Sean P. DeNigris
Administrator
 
Hi guys, forgive my potentially naive intrusion, but I've noticed a lot of
git commits which seem like noise. When I make commits like these - e.g.
tweaking tiny details to pacify CI - I call it "programming by flopping
around" ha ha. Anyway, as I've recently learned, a great practice is to
perform these on another branch until things are working, and then squash
all the commits into one before merging - usually pretty easy with git. That
having been said, I know very little about the VM dev process, so if none of
this applies, feel free to consider me a crazy old man mumbling things on
the street corner to passersby ;)



-----
Cheers,
Sean
--
Sent from: http://forum.world.st/Squeak-VM-f104410.html
Cheers,
Sean
Reply | Threaded
Open this post in threaded view
|

Re: Commit process

Eliot Miranda-2
 
Hi Sean,


> On Mar 8, 2018, at 6:06 AM, Sean P. DeNigris <[hidden email]> wrote:
>
>
> Hi guys, forgive my potentially naive intrusion, but I've noticed a lot of
> git commits which seem like noise. When I make commits like these - e.g.
> tweaking tiny details to pacify CI - I call it "programming by flopping
> around" ha ha. Anyway, as I've recently learned, a great practice is to
> perform these on another branch until things are working, and then squash
> all the commits into one before merging - usually pretty easy with git. That
> having been said, I know very little about the VM dev process, so if none of
> this applies, feel free to consider me a crazy old man mumbling things on
> the street corner to passersby ;)

Those commits were on a branch.  I agree that it's best not to push after each commit.  The emails however confused me too.  Is it possible for the commit emails to clearly state the branch name?

>
>
>
> -----
> Cheers,
> Sean
> --
> Sent from: http://forum.world.st/Squeak-VM-f104410.html
Reply | Threaded
Open this post in threaded view
|

Re: Commit process

Alistair Grant
 
Hi Eliot,

On 8 March 2018 at 16:34, Eliot Miranda <[hidden email]> wrote:
>
> Those commits were on a branch.  I agree that it's best not to push after each commit.  The emails however confused me too.  Is it possible for the commit emails to clearly state the branch name?

First line in the body of the email, e.g.:

  Branch: refs/heads/krono/openbsd
  Home:   https://github.com/OpenSmalltalk/opensmalltalk-vm
  Commit: 50595dc143262893c380228fbe4ab2f1f848a43e
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/50595dc143262893c380228fbe4ab2f1f848a43e
  Author: Tobias Pape <[hidden email]>
  Date:   2018-03-08 (Thu, 08 Mar 2018)


Cheers,
Alistair
Reply | Threaded
Open this post in threaded view
|

Re: Commit process

Tobias Pape
 
Hello People,

> On 08.03.2018, at 16:43, Alistair Grant <[hidden email]> wrote:
>
>
> Hi Eliot,
>
> On 8 March 2018 at 16:34, Eliot Miranda <[hidden email]> wrote:
>>
>> Those commits were on a branch.  I agree that it's best not to push after each commit.  The emails however confused me too.  Is it possible for the commit emails to clearly state the branch name?
>
> First line in the body of the email, e.g.:
>
>  Branch: refs/heads/krono/openbsd
>  Home:   https://github.com/OpenSmalltalk/opensmalltalk-vm
>  Commit: 50595dc143262893c380228fbe4ab2f1f848a43e
>      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/50595dc143262893c380228fbe4ab2f1f848a43e
>  Author: Tobias Pape <[hidden email]>
>  Date:   2018-03-08 (Thu, 08 Mar 2018)
>

Sorry for the noise but I'm working simultaneously on 3 machines and try to keep travis happy, that's why I needed to push a lot to the branch.

Best regards
        -Tobias


Reply | Threaded
Open this post in threaded view
|

Re: Commit process

Eliot Miranda-2
In reply to this post by Eliot Miranda-2
 
Hi Alistair,

> On Mar 8, 2018, at 7:34 AM, Eliot Miranda <[hidden email]> wrote:
>
> Hi Sean,
>
>
>> On Mar 8, 2018, at 6:06 AM, Sean P. DeNigris <[hidden email]> wrote:
>>
>>
>> Hi guys, forgive my potentially naive intrusion, but I've noticed a lot of
>> git commits which seem like noise. When I make commits like these - e.g.
>> tweaking tiny details to pacify CI - I call it "programming by flopping
>> around" ha ha. Anyway, as I've recently learned, a great practice is to
>> perform these on another branch until things are working, and then squash
>> all the commits into one before merging - usually pretty easy with git. That
>> having been said, I know very little about the VM dev process, so if none of
>> this applies, feel free to consider me a crazy old man mumbling things on
>> the street corner to passersby ;)
>
> Those commits were on a branch.  I agree that it's best not to push after each commit.  The emails however confused me too.  Is it possible for the commit emails to clearly state the branch name?

Sorry.  I meant yo say the title of the emails.  In Tobias' defence, if one is working on the CI then, without a lot of effort, one has no choice other than to commit so that the CI can pull and do its thang.  Perhaps turning off the notifications for certain branches is possible?

>
>>
>>
>>
>> -----
>> Cheers,
>> Sean
>> --
>> Sent from: http://forum.world.st/Squeak-VM-f104410.html
Reply | Threaded
Open this post in threaded view
|

Re: Commit process

Alistair Grant
In reply to this post by Tobias Pape
 
Hi Tobias,

On 8 March 2018 at 16:50, Tobias Pape <[hidden email]> wrote:

>
> Hello People,
>
>> On 08.03.2018, at 16:43, Alistair Grant <[hidden email]> wrote:
>>
>>
>> Hi Eliot,
>>
>> On 8 March 2018 at 16:34, Eliot Miranda <[hidden email]> wrote:
>>>
>>> Those commits were on a branch.  I agree that it's best not to push after each commit.  The emails however confused me too.  Is it possible for the commit emails to clearly state the branch name?
>>
>> First line in the body of the email, e.g.:
>>
>>  Branch: refs/heads/krono/openbsd
>>  Home:   https://github.com/OpenSmalltalk/opensmalltalk-vm
>>  Commit: 50595dc143262893c380228fbe4ab2f1f848a43e
>>      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/50595dc143262893c380228fbe4ab2f1f848a43e
>>  Author: Tobias Pape <[hidden email]>
>>  Date:   2018-03-08 (Thu, 08 Mar 2018)
>>
>
> Sorry for the noise but I'm working simultaneously on 3 machines and try to keep travis happy, that's why I needed to push a lot to the branch.

Do you really need to update the CI, or are you just trying to keep
the 3 machines in sync?

If you don't need to update the CI, would it be possible to have a
local repository that you update, and then push to the main repository
when ready?  (you can have multiple remotes for a repository).

Cheers,
Alistair
Reply | Threaded
Open this post in threaded view
|

Re: Commit process

Nicolas Cellier
In reply to this post by Eliot Miranda-2
 


2018-03-08 17:03 GMT+01:00 Eliot Miranda <[hidden email]>:

Hi Alistair,

> On Mar 8, 2018, at 7:34 AM, Eliot Miranda <[hidden email]> wrote:
>
> Hi Sean,
>
>
>> On Mar 8, 2018, at 6:06 AM, Sean P. DeNigris <[hidden email]> wrote:
>>
>>
>> Hi guys, forgive my potentially naive intrusion, but I've noticed a lot of
>> git commits which seem like noise. When I make commits like these - e.g.
>> tweaking tiny details to pacify CI - I call it "programming by flopping
>> around" ha ha. Anyway, as I've recently learned, a great practice is to
>> perform these on another branch until things are working, and then squash
>> all the commits into one before merging - usually pretty easy with git. That
>> having been said, I know very little about the VM dev process, so if none of
>> this applies, feel free to consider me a crazy old man mumbling things on
>> the street corner to passersby ;)
>
> Those commits were on a branch.  I agree that it's best not to push after each commit.  The emails however confused me too.  Is it possible for the commit emails to clearly state the branch name?

Sorry.  I meant yo say the title of the emails.  In Tobias' defence, if one is working on the CI then, without a lot of effort, one has no choice other than to commit so that the CI can pull and do its thang.  Perhaps turning off the notifications for certain branches is possible?


Personnally, i prefer to see the individual commits rather than a big ball of changes.
Even the mistakes are valuable, we may learn something.
I'm not a fan of squashing nor any other attempt to rewrite history.

I've been away from vm dev for a few months and was also a bit confused by proliferation of commit mails, BUT:

1) as Alistair noticed, the branch name is explicitely written in the mail.
So I should learn to better decipher those messages

2) I'm unsure about the benefits of turning the notifications off.
It's always possible to fork the repository and work in a clone, the clone can benefit from travis, and the mailing list won't be notified by the clone.

Branching directly in a common repository has some benefits:
- the work is publicized
- the work is more easily reviewable
- team can more easily collaborate (commit) on the branch
 (easier than going thru PR in forks)

Nicolas


>
>>
>>
>>
>> -----
>> Cheers,
>> Sean
>> --
>> Sent from: http://forum.world.st/Squeak-VM-f104410.html