Re: Bug in git-cvsexportcommit: can't commit files which have been removed from CVS

From: Jeff King <peff@peff.net>
Date: May 28, 2009, 20:06 UTC
Message-ID: <20090528200635.GJ13499@coredump.intra.peff.net>
In-Reply-To: <4A1EC184.50107@yahoo.co.uk>

On Thu, May 28, 2009 at 05:53:24PM +0100, Nick Woolley wrote:

Show 9 quoted lines

> I have a patch against the current version of git's repository which
> seems to fix the problem.  This is actually three commits:
>  - the fix,
>  - an extension to t9200-git-cvsexportcommit.sh to test the fix
>  - EOL whitespace-removal
> 
> I'm hesitant to send all three as separate emails, even though the
> SubmittingPatches document seems to imply I should - should I squash
> them into one commit?

Don't worry about sending multiple messages to the list. It is the normal behavior here. But you may want to collapse it somewhat:

  1. If your whitespace removal is a cleanup in nearby code, then that
     should probably come as the first patch.

  2. Your fix and the test extension should probably come in the same
     patch (we do sometimes do tests separately beforehand, marking them
     to expect failure, but that is usually only because nobody has a
     fix when the test is written :) ).

     If the whitespace removal is for the lines in your actual fix,
     then that should just be squashed in. There is no point showing us
     your broken-styled code to review, only to fix it in the very next
     commit.

So I would expect either a single patch (with cleaned-up fix and tests) or a two-patch series (cleanups in the area, followed by your fix and tests).

-Peff