Re: [gentoo-dev] Git workflow, commit messages

On 8/9/15 10:31 AM, Gordon Pettey wrote: On Sun, Aug 9, 2015 at 7:06 AM, Anthony G. Basile wrote: Particularly, we should prepend "CATEGORY/PN: " to the first line so we can easily search git log for what happened to a package. Good format to help reading unfiltered logs, but invalid reason

Re: [gentoo-dev] Git workflow, commit messages

On 08/09/2015 04:31 PM, Gordon Pettey wrote: > On Sun, Aug 9, 2015 at 7:06 AM, Anthony G. Basile > wrote: > > > Particularly, we should prepend "CATEGORY/PN: " to the first line so > we can easily search git log for what happened to a package. > > > Good for

Re: [gentoo-dev] Git workflow, commit messages

On 2015-08-09 09:31, Gordon Pettey wrote: > On Sun, Aug 9, 2015 at 7:06 AM, Anthony G. Basile > wrote: > > > > > Particularly, we should prepend "CATEGORY/PN: " to the first line so we > > can easily search git log for what happened to a package. > > > > > Good format to help reading unfiltered l

Re: [gentoo-dev] Git workflow, commit messages

On Sun, Aug 9, 2015 at 7:06 AM, Anthony G. Basile wrote: > > Particularly, we should prepend "CATEGORY/PN: " to the first line so we > can easily search git log for what happened to a package. > > Good format to help reading unfiltered logs, but invalid reasoning. 'git log portage/cat/pn' or 'git

Re: [gentoo-dev] Git workflow, commit messages

On 08/09/2015 02:06 PM, Anthony G. Basile wrote: > Hi everyone, > > I hate to be a nag, but please read > https://wiki.gentoo.org/wiki/Gentoo_git_workflow. In particular, commit > messages. I'm seeing lots of cvs style messages going in and without > history it will be hard to figure out what ha

Re: [gentoo-dev] Git workflow, commit messages

Sunday 09 Aug 2015 20:17:57, Patrick Lauer wrote : > On Sunday 09 August 2015 08:06:53 Anthony G. Basile wrote: > > Hi everyone, > > > > I hate to be a nag, but please read > > https://wiki.gentoo.org/wiki/Gentoo_git_workflow. In particular, commit > > messages. I'm seeing lots of cvs style mess

Re: [gentoo-dev] Git workflow, commit messages

"Anthony G. Basile" napisał: >Hi everyone, > >I hate to be a nag, but please read >https://wiki.gentoo.org/wiki/Gentoo_git_workflow. In particular, >commit >messages. I'm seeing lots of cvs style messages going in and without >history it will be hard to figure out what happened just from t

Re: [gentoo-dev] Git workflow, commit messages

On Sunday 09 August 2015 08:06:53 Anthony G. Basile wrote: > Hi everyone, > > I hate to be a nag, but please read > https://wiki.gentoo.org/wiki/Gentoo_git_workflow. In particular, commit > messages. I'm seeing lots of cvs style messages going in and without > history it will be hard to figure o

[gentoo-dev] Git workflow, commit messages

Hi everyone, I hate to be a nag, but please read https://wiki.gentoo.org/wiki/Gentoo_git_workflow. In particular, commit messages. I'm seeing lots of cvs style messages going in and without history it will be hard to figure out what happened just from the message. Particularly, we should p

Re: [gentoo-dev] Git workflow

On Sun, Jul 5, 2015 at 3:22 PM, Brian Dolbec wrote: > > I would think that there would be a very small number of branches to the > main master tree. Those would be for the large projects like kde, > gnome,... They would still do their development work in their > overlays, then move them into a b

Re: [gentoo-dev] Git workflow

On 07/05/2015 08:57 PM, William Hubbs wrote: > On Sun, Jul 05, 2015 at 04:03:27PM +0200, hasufell wrote: >> On 07/05/2015 06:10 AM, C Bergström wrote: > 5) More about linear commits and "history" - I need to double check, > but I don't think rebase changes the actual commit date (I could be

Re: [gentoo-dev] Git workflow

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On Sun, 05 Jul 2015 21:35:23 +0200 hasufell wrote: > https://wiki.gentoo.org/wiki/Gentoo_git_workflow#naming_convention > Ah ha! I must have missed that the last time that I read that wiki article. Thanks for the link hasufell. - -- NP-Hardass

Re: [gentoo-dev] Git workflow

On 07/05/2015 09:00 PM, NP-Hardass wrote: > On July 5, 2015 2:57:14 PM EDT, William Hubbs > wrote: >> If you are working on a topic branch to make your changes, which has >> not >> been published, just rebase that branch on master, then merge it to >> master, and no one knows any different. > >>

Re: [gentoo-dev] Git workflow

-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On Sun, 5 Jul 2015 15:00:26 -0400 NP-Hardass wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > On July 5, 2015 2:57:14 PM EDT, William Hubbs > wrote: > >If you are working on a topic branch to make your changes, which has > >not > >b

Re: [gentoo-dev] Git workflow

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On July 5, 2015 2:57:14 PM EDT, William Hubbs wrote: >If you are working on a topic branch to make your changes, which has >not >been published, just rebase that branch on master, then merge it to >master, and no one knows any different. > >William

Re: [gentoo-dev] Git workflow

On Sun, Jul 05, 2015 at 04:03:27PM +0200, hasufell wrote: > On 07/05/2015 06:10 AM, C Bergström wrote: > >>> 5) More about linear commits and "history" - I need to double check, > >>> but I don't think rebase changes the actual commit date (I could be > >>> mistaken). > >> > >> You are mistaken, an

Re: [gentoo-dev] Git workflow

Sunday 05 Jul 2015 16:03:27, hasufell wrote : > On 07/05/2015 06:10 AM, C Bergström wrote: > >>> 5) More about linear commits and "history" - I need to double check, > >>> but I don't think rebase changes the actual commit date (I could be > >>> mistaken). > >> > >> You are mistaken, and should hav

Re: [gentoo-dev] Git workflow

On 07/05/2015 06:10 AM, C Bergström wrote: >>> 5) More about linear commits and "history" - I need to double check, >>> but I don't think rebase changes the actual commit date (I could be >>> mistaken). >> >> You are mistaken, and should have double checked before you argued. >> >> Arguing without

Re: [gentoo-dev] Git workflow

C Bergström wrote: > >> 3) Ever tried to make a patch of the *actual* merge commit? Can one of > >> the advocates of merge show me the git command to do that? (Sure you > >> can diff between 2 commits, but the "merge" commit likes to avoid > >> being seen) > > > > If there are no conflicts when mer

Re: [gentoo-dev] Git workflow

On Sun, Jul 5, 2015 at 6:54 AM, Peter Stuge wrote: > C Bergström wrote: >> 3) Ever tried to make a patch of the *actual* merge commit? Can one of >> the advocates of merge show me the git command to do that? (Sure you >> can diff between 2 commits, but the "merge" commit likes to avoid >> being s

Re: [gentoo-dev] Git workflow

On Sat, Jul 4, 2015 at 2:36 PM, Peter Stuge wrote: > C Bergström wrote: > >> 2) merge commits lead to multiple parents, which breaks a clean and >> simple to follow linear history > > This is either a bug or a feature depending on whether development > was actually linear. Sometimes it is, but som

Re: [gentoo-dev] Git workflow

C Bergström wrote: > 1) Rebase doesn't obscure history, That's plain wrong. Rebasing changes the parent of your commit. That means that others can no longer see the history of your commit, specifically its original parent. Sometimes the parent is irrelevant, sometimes it is critical. > (Unless y

Re: [gentoo-dev] Git workflow

On 07/04/2015 09:23 PM, C Bergström wrote: > On Sun, Jul 5, 2015 at 1:56 AM, hasufell wrote: >> >> Forcing a rebase-only workflow on developers will increase the amount of >> bad commits. Because non-trivial conflicts in rebases are difficult to >> resolve, since you fix conflicts for _every_ comm

Re: [gentoo-dev] Git workflow

On Sun, Jul 5, 2015 at 3:33 AM, Alon Bar-Lev wrote: > On 4 July 2015 at 23:28, Alexandre Rostovtsev wrote: >> >> On Sun, 2015-07-05 at 02:16 +0700, C Bergström wrote: >> > 2) I don't understand your comment about signatures. >> >> Gpg commit signatures [1] which are a requirement for any gentoo g

Re: [gentoo-dev] Git workflow

On 4 July 2015 at 23:28, Alexandre Rostovtsev wrote: > > On Sun, 2015-07-05 at 02:16 +0700, C Bergström wrote: > > 2) I don't understand your comment about signatures. > > Gpg commit signatures [1] which are a requirement for any gentoo git > workflow. Rebasing breaks the author's signature afaict

Re: [gentoo-dev] Git workflow

On Sun, 2015-07-05 at 02:16 +0700, C Bergström wrote: > 2) I don't understand your comment about signatures. Gpg commit signatures [1] which are a requirement for any gentoo git workflow. Rebasing breaks the author's signature afaict, so the user who is doing rebasing needs to re-sign the commit u

Re: [gentoo-dev] Git workflow

On Sun, Jul 5, 2015 at 1:56 AM, hasufell wrote: > On 07/04/2015 08:17 PM, C Bergström wrote: >> I realize that this is subject to lots of different opinions and that >> my input doesn't carry much weight - At least I thought it's a topic >> that should be brought up (again?) >> - >> To sta

Re: [gentoo-dev] Git workflow

On Sat, Jul 04, 2015 at 02:33:04PM -0400, NP-Hardass wrote: > > > On July 4, 2015 2:17:41 PM EDT, "C Bergström" > wrote: > >I realize that this is subject to lots of different opinions and that > >my input doesn't carry much weight - At least I thought it's a topic > >that should be brought up

Re: [gentoo-dev] Git workflow

On Sun, Jul 5, 2015 at 1:42 AM, Rich Freeman wrote: > On Sat, Jul 4, 2015 at 2:17 PM, C Bergström wrote: >> >> What I personally prefer is a rebase workflow. > > The recommendation is to rebase when practical. > > Rebasing makes the history look clean, but it sometimes does this by > obscuring th

Re: [gentoo-dev] Git workflow

On 07/04/2015 08:17 PM, C Bergström wrote: > I realize that this is subject to lots of different opinions and that > my input doesn't carry much weight - At least I thought it's a topic > that should be brought up (again?) > - > To start I hate git.. I have used it for years now and the

Re: [gentoo-dev] Git workflow

On Sat, Jul 4, 2015 at 2:17 PM, C Bergström wrote: > > What I personally prefer is a rebase workflow. The recommendation is to rebase when practical. Rebasing makes the history look clean, but it sometimes does this by obscuring the real history. It also discards original author commits with th

Re: [gentoo-dev] Git workflow

C Bergström wrote: > To start I hate git.. I have used it for years now and the > multitude of ways that are possible to accomplish nearly the same > thing are *annoying* at best.. I'd be interested to hear a couple of examples of what you mean, perhaps in a private mail. Tack på förhand. :)

Re: [gentoo-dev] Git workflow

On July 4, 2015 2:17:41 PM EDT, "C Bergström" wrote: >I realize that this is subject to lots of different opinions and that >my input doesn't carry much weight - At least I thought it's a topic >that should be brought up (again?) >- >To start I hate git.. I have used it for years now

[gentoo-dev] Git workflow

I realize that this is subject to lots of different opinions and that my input doesn't carry much weight - At least I thought it's a topic that should be brought up (again?) - To start I hate git.. I have used it for years now and the multitude of ways that are possible to accomplish ne