Re: [RFC] git-publish

From: Alex Riesen <raa.lkml@gmail.com>
Date: Aug 14, 2006, 09:01 UTC
Message-ID: <81b0412b0608140201x364ec92ifdd3bfa71baa4f4e@mail.gmail.com>
In-Reply-To: <20060813204118.GA21956@mars.ravnborg.org>

On 8/13/06, Sam Ravnborg <sam@ravnborg.org> wrote:

Show 14 quoted lines

> On Sun, Aug 13, 2006 at 04:11:32PM -0400, Daniel Barkalow wrote:
> > On Sun, 13 Aug 2006, Sam Ravnborg wrote:
> >
> > > But important note is that publishing is something I defer until some
> > > limited test has been done. And when I omit that I have always ended u
> > > pushing some crappy stuff that needs to be dealt with.
> >
> > I also test before publishing. But I test before committing, too, because
> > I never get anything right (or even logically complete) the first time. My
> > cycle is edit/build/test, and if the test is successful, I commit and
> > push.
>
> It happens that I discover bugs while working on next issue.
> And sometime I get my light moments after commiting a patch.

In such a case I usually run git log or gitk to find the commit where a fix is best applied, git checkout -b tmp <commit-sha1>, edit/commit, git checkout <test-branch> (if needed), git pull . tmp, find out that I made a typo, fix it, test, "git checkout -m tmp" and "git commit" and finally merge the tmp branch or cherry-pick the changes somewhere safe. Then remove the tmp branch (it's such a special branch to me). Sometimes I clone the current repo somewhere just to create the temporary branch there, work in the cloned repo, and pull fixes to test back in the first repo (it helps to avoid recompilations, while only fixed files will be updated and recompile)