Re: [riot-devel] RFC: development procedures
Hi Martine!
On Fri, Aug 19, 2016 at 10:53:49PM +0200, Martine Lenders wrote:
> Oleg Hahm wrote:
> > Yes, it takes more time, but just a few seconds if the commit messages are
> sensible. I never use autosquashing.
>
> You should try it, its REEAAALLY convenient.
I did some time ago and couldn't see a big advantage and prefer meaningful
commit messages.
Cheers,
Oleg
--
panic("Halt failed!");
linux-2.6.6/arch/sparc/kernel/process.c
signature.asc
Description: PGP signature
___
devel mailing list
devel@riot-os.org
https://lists.riot-os.org/mailman/listinfo/devel
Re: [riot-devel] RFC: development procedures
Hi Kaspar, 2016-08-19 22:34 GMT+02:00 Kaspar Schleiser : > Hi, > > On 08/19/2016 08:05 PM, Martine Lenders wrote: > >>> Not necessarily. I would put such links to comments in the commit body > >>> anyway and that is ignored by --autosquash. > >> > >> Not necessarily what? > > > > Rule out --fixup commits > > Did you read my email? You cannot change the commit message of --fixup > commits - it is always "!fixup " > without body. You can add a body when using "--squash" (the subject will > always be "!squash ", but that body would always get > folded away by the github interface. If anyone would like to see a > comment you've added to such a commit, you have to press the little > "..." icon. > Yes, that's true (somehow I overread that important part O_o)... But I don't really see it as an inconvenience as long as the information is there. Oleg Hahm wrote: > Yes, it takes more time, but just a few seconds if the commit messages are sensible. I never use autosquashing. You should try it, its REEAAALLY convenient. Hm, ... maybe there is a way to provide some hooks that can do all this (edit --fixup message, use hash instead of message of original commit, change rebase -i --autosquash so it greps commit hashes instead of commit messages). If I find time I will look into it after the weekend. Cheers, Martine ___ devel mailing list devel@riot-os.org https://lists.riot-os.org/mailman/listinfo/devel
Re: [riot-devel] RFC: development procedures
Hi, On 08/19/2016 08:05 PM, Martine Lenders wrote: >>> Not necessarily. I would put such links to comments in the commit body >>> anyway and that is ignored by --autosquash. >> >> Not necessarily what? > > Rule out --fixup commits Did you read my email? You cannot change the commit message of --fixup commits - it is always "!fixup " without body. You can add a body when using "--squash" (the subject will always be "!squash ", but that body would always get folded away by the github interface. If anyone would like to see a comment you've added to such a commit, you have to press the little "..." icon. Kaspar ___ devel mailing list devel@riot-os.org https://lists.riot-os.org/mailman/listinfo/devel
Re: [riot-devel] RFC: development procedures
Hi,
On Fri, Aug 19, 2016 at 05:54:07PM +0200, Martine Lenders wrote:
> 2016-08-19 17:25 GMT+02:00 Kaspar Schleiser :
> > On 08/19/2016 05:15 PM, Oleg Hahm wrote:
> > > Hence, I would propose to somehow reference the addressed
> > > comment in the commit message. What do you think?
> >
> > That would rule out --fixup commits (and thus automatic rebasing). "git
> > commit --squash" allows adding to the commit message, but the commit
> > subject stays the same, so in order to improve things, one would have to
> > unfold the whole message in git's PR overview
> >
>
> Not necessarily. I would put such links to comments in the commit body
> anyway and that is ignored by --autosquash.
hm, that makes it rather inconvenient to review - particular with the "new"
shitty GitHub UI.
> > Actually, I've never found a big advantage in automatic rebasing. If you
> > specify both, the addressed comment and the corresponding commit in the
> > commit
> > message, interactive rebasing can be done in no time.
> >
>
> Well you still have to read and compare every single commit, which
> --autosquash just takes a way. So you still need way more time. ;-)
Yes, it takes more time, but just a few seconds if the commit messages are
sensible. I never use autosquashing.
Cheers,
Oleg
--
panic("bad_user_access_length executed (not cool, dude)");
linux-2.0.38/kernel/panic.c
signature.asc
Description: PGP signature
___
devel mailing list
devel@riot-os.org
https://lists.riot-os.org/mailman/listinfo/devel
Re: [riot-devel] RFC: development procedures
how do you put a link in the body of a --fixup-commi? -Original Message- From: Martine Lenders To: RIOT OS kernel developers Sent: Fr., 19 Aug. 2016 20:06 Subject: Re: [riot-devel] RFC: development procedures Hi, Am 19.08.2016 7:51 nachm. schrieb "Kaspar Schleiser" : > > Hey, > > On 08/19/2016 05:54 PM, Martine Lenders wrote: > > Not necessarily. I would put such links to comments in the commit body > > anyway and that is ignored by --autosquash. > > Not necessarily what? Rule out --fixup commits ___ devel mailing list devel@riot-os.org https://lists.riot-os.org/mailman/listinfo/devel
Re: [riot-devel] RFC: development procedures
Hi, Am 19.08.2016 7:51 nachm. schrieb "Kaspar Schleiser" : > > Hey, > > On 08/19/2016 05:54 PM, Martine Lenders wrote: > > Not necessarily. I would put such links to comments in the commit body > > anyway and that is ignored by --autosquash. > > Not necessarily what? Rule out --fixup commits ___ devel mailing list devel@riot-os.org https://lists.riot-os.org/mailman/listinfo/devel
Re: [riot-devel] RFC: development procedures
Hey, On 08/19/2016 05:54 PM, Martine Lenders wrote: > Not necessarily. I would put such links to comments in the commit body > anyway and that is ignored by --autosquash. Not necessarily what? Kaspar ___ devel mailing list devel@riot-os.org https://lists.riot-os.org/mailman/listinfo/devel
Re: [riot-devel] RFC: development procedures
Hi, 2016-08-19 17:25 GMT+02:00 Kaspar Schleiser : > Hey, > > On 08/19/2016 05:15 PM, Oleg Hahm wrote: > > Hence, I would propose to somehow reference the addressed > > comment in the commit message. What do you think? > > That would rule out --fixup commits (and thus automatic rebasing). "git > commit --squash" allows adding to the commit message, but the commit > subject stays the same, so in order to improve things, one would have to > unfold the whole message in git's PR overview > Not necessarily. I would put such links to comments in the commit body anyway and that is ignored by --autosquash. > (+1 in general...) > +1 from my side too. 2016-08-19 17:39 GMT+02:00 Oleg Hahm : > Actually, I've never found a big advantage in automatic rebasing. If you > specify both, the addressed comment and the corresponding commit in the > commit > message, interactive rebasing can be done in no time. > Well you still have to read and compare every single commit, which --autosquash just takes a way. So you still need way more time. ;-) Regards, Martine ___ devel mailing list devel@riot-os.org https://lists.riot-os.org/mailman/listinfo/devel
Re: [riot-devel] RFC: development procedures
Hi! On Fri, Aug 19, 2016 at 05:25:32PM +0200, Kaspar Schleiser wrote: > On 08/19/2016 05:15 PM, Oleg Hahm wrote: > > Hence, I would propose to somehow reference the addressed > > comment in the commit message. What do you think? > > That would rule out --fixup commits (and thus automatic rebasing). "git > commit --squash" allows adding to the commit message, but the commit > subject stays the same, so in order to improve things, one would have to > unfold the whole message in git's PR overview. Actually, I've never found a big advantage in automatic rebasing. If you specify both, the addressed comment and the corresponding commit in the commit message, interactive rebasing can be done in no time. A potential other solution would be to use something like Gerrit, but I guess no one here wants this. ;-) Cheers, Oleg -- The best thing about script jokes is that they start with a bang. signature.asc Description: PGP signature ___ devel mailing list devel@riot-os.org https://lists.riot-os.org/mailman/listinfo/devel
Re: [riot-devel] RFC: development procedures
Hey, On 08/19/2016 05:15 PM, Oleg Hahm wrote: > Hence, I would propose to somehow reference the addressed > comment in the commit message. What do you think? That would rule out --fixup commits (and thus automatic rebasing). "git commit --squash" allows adding to the commit message, but the commit subject stays the same, so in order to improve things, one would have to unfold the whole message in git's PR overview. (+1 in general...) Kaspar ___ devel mailing list devel@riot-os.org https://lists.riot-os.org/mailman/listinfo/devel
[riot-devel] RFC: development procedures
Dear reviewing IoTlers, looking at https://github.com/RIOT-OS/RIOT/pull/5758, I just realized that our convention to add squash commits while a PR is under review may need an amendment. If all commits that addresses a certain comment and are meant for squashing have a non-speaking commit message (see linked PR), then it gets more time-consuming for the reviewer to map a commit to a certain review-reaction. Hence, I would propose to somehow reference the addressed comment in the commit message. What do you think? Cheers, Oleg -- printk(KERN_WARNING MYNAM ": (time to go bang on somebodies door)\n"); linux-2.6.6/drivers/message/fusion/mptctl.c signature.asc Description: PGP signature ___ devel mailing list devel@riot-os.org https://lists.riot-os.org/mailman/listinfo/devel
