Re: git-diff on touched files: bug or feature?

[Jeff King <peff@peff.net>]

On Fri, Aug 03, 2007 at 12:59:43AM -0700, Junio C Hamano wrote:

> On the other hand, if your workflow is "work on one thing at a
> time, and never make partial commits", then your diff tends to
> be small and more focused to begin with, and you can afford to
> care about "touched but ended up unmodified".  Interestingly, it

In an ideal world, I would work that way. But often you uncover a bug in
existing code while writing new code, and you want to make that bugfix a
separate commit. I generally make a partial commit to stash the bugfix
and test it individually. Without making a partial commit, how would you
split the bugfix changes from the working changes?  Or do you manually
pull the bugfix into another branch or working tree?

There is one point you didn't address from my original mail which I
would be curious to hear your take on. In your workflow, how do you
remind yourself that there are untracked files that need to be added? Do
you just wait until you see the commit template at the end?

-Peff