Re: How do you deal with incomplete commits?

2020-11-02 Thread Thomas Friedrichsmeier
Am Mon, 02 Nov 2020 17:51:29 + schrieb David Jarvie : > On Monday 02 Nov 2020 18:39:52 Thomas Friedrichsmeier wrote: > > I ended up writing a local pre-commit hook, which has the advantage > > of triggering on the commit directly after "the problem commit", > > thus increasing the likelihood

Re: How do you deal with incomplete commits?

2020-11-02 Thread David Hurka
On Monday, November 2, 2020 7:00:40 PM CET David Hurka wrote: > It would probably be nice to have some post-checkout commit, with which you > can spit you own WIP commit message in your face, right after you switch to > your work branch. Horrible wording, sorry. It means: It would probably be

Re: How do you deal with incomplete commits?

2020-11-02 Thread Nicolás Alvarez
El lun., 2 de nov. de 2020 a la(s) 15:01, David Hurka (david.hu...@mailbox.org) escribió: > > > I ended up writing a local pre-commit hook, which has the advantage of > > triggering on the commit directly after "the problem commit", thus > > increasing the likelihood there is still a trivial way

Re: How do you deal with incomplete commits?

2020-11-02 Thread David Hurka
> I ended up writing a local pre-commit hook, which has the advantage of > triggering on the commit directly after "the problem commit", thus > increasing the likelihood there is still a trivial way to sort > things out. It would probably be nice to have some post-checkout commit, with which you

Re: How do you deal with incomplete commits?

2020-11-02 Thread David Jarvie
On Monday 02 Nov 2020 18:39:52 Thomas Friedrichsmeier wrote: > I ended up writing a local pre-commit hook, which has the advantage of > triggering on the commit directly after "the problem commit", thus > increasing the likelihood there is still a trivial way to sort > things out. Would you mind

Re: How do you deal with incomplete commits?

2020-11-02 Thread Thomas Friedrichsmeier
Am Sun, 01 Nov 2020 09:52:27 -0800 schrieb Thiago Macieira : > On Saturday, 31 October 2020 08:25:40 PST Thomas Friedrichsmeier > wrote: > > thanks for your answer (also to Nate). But to clarify, my question > > is really: How do I _force_ myself to clean up in time? > > If you're pushing to a

Re: How do you deal with incomplete commits?

2020-11-01 Thread Thiago Macieira
On Saturday, 31 October 2020 08:25:40 PST Thomas Friedrichsmeier wrote: > thanks for your answer (also to Nate). But to clarify, my question is > really: How do I _force_ myself to clean up in time? If you're pushing to a code review system of any kind, it doesn't matter. First, you should

Re: How do you deal with incomplete commits?

2020-10-31 Thread Nicolás Alvarez
El sáb., 31 de oct. de 2020 a la(s) 15:19, Thomas Friedrichsmeier (thomas.friedrichsme...@kdemail.net) escribió: > > Am Sat, 31 Oct 2020 17:09:22 +0100 > schrieb David Hurka : > > Maybe you could write your own commit hook, which prevents commiting > > anything when `git log --oneline` matches,

Re: How do you deal with incomplete commits?

2020-10-31 Thread Thomas Friedrichsmeier
Am Sat, 31 Oct 2020 17:09:22 +0100 schrieb David Hurka : > Maybe you could write your own commit hook, which prevents commiting > anything when `git log --oneline` matches, say /\A INCOMPLETE/x. Hm, true, it doesn't have to be a server-side hook. Thanks for pointing me in the right direction.

Re: How do you deal with incomplete commits?

2020-10-31 Thread David Hurka
On Saturday, October 31, 2020 4:38:09 PM CET Thomas Baumgart wrote: > Hi, > > On Samstag, 31. Oktober 2020 16:24:51 CET Thomas Friedrichsmeier wrote: > > Hi, > > > > thanks for your answer (also to Nate). But to clarify, my question is > > really: How do I _force_ myself to clean up in time? >

Re: How do you deal with incomplete commits?

2020-10-31 Thread Thomas Friedrichsmeier
Hi, Am Sat, 31 Oct 2020 16:38:09 +0100 schrieb Thomas Baumgart : > Reading your question over and over, I don't see where git is > mentioned :) This leads to a short answer: self-discipline. > > My impression is that you look for a some magic feature in git that > forces you to clean up in time.

Re: How do you deal with incomplete commits?

2020-10-31 Thread Thomas Baumgart
Hi, On Samstag, 31. Oktober 2020 16:24:51 CET Thomas Friedrichsmeier wrote: > Hi, > > thanks for your answer (also to Nate). But to clarify, my question is > really: How do I _force_ myself to clean up in time? Reading your question over and over, I don't see where git is mentioned :) This

Re: How do you deal with incomplete commits?

2020-10-31 Thread Thomas Friedrichsmeier
Hi, thanks for your answer (also to Nate). But to clarify, my question is really: How do I _force_ myself to clean up in time? Am Sat, 31 Oct 2020 15:44:35 +0100 schrieb Thomas Baumgart : > On Samstag, 31. Oktober 2020 13:39:04 CET Thomas Friedrichsmeier > wrote: [...] > > Say I'm working on

Re: How do you deal with incomplete commits?

2020-10-31 Thread Nate Graham
Work branches or a branch in a personal fork seem appropriate for this, and then you can interactively rebase to clean up the history before you submit a merge request. That's what I do. Nate

Re: How do you deal with incomplete commits?

2020-10-31 Thread Thomas Baumgart
Hi Thomas, On Samstag, 31. Oktober 2020 13:39:04 CET Thomas Friedrichsmeier wrote: > Hi all, > > may I pick your brains for this question that keeps coming up for me? > > Say I'm working on a feature in branch A. I have some changes in my > working copy that are so half-baked that I don't want