Re: [RFC/ PATCH 4/5] t3030: update porcelain expected message

Diane Gasselin <diane.gasselin@ensimag.imag.fr> writes:

You did something strange with git format-patch or send-email. This From header should appear in the header of your email, but not in the body.

We usually try to have the test-suite pass for each commit (so that "git bisect" can be used easily among other reasons). So, you probably want to squash this patch with the one that actually changes the message. Also, I think it eases reviewing: the changes to the test-suite can be seen as a specification (particularly clear here: we know what the rest of the patch serie does reading this patch).

Another trick is to set the tests as "test_expect_failure" before introducing the feature, and mark them as "test_expect_success" when appropriate. This way, you can add new tests before adding the feature, without introducing broken commits.

I'd have phrased it like this:

error: Your local changes to these files would be overwritten by merge:
	a

to avoid splitting the message in two parts. It's more consistant with the rest of Git (git status or git reset for example). Also, your version would become hard to read if the file list is long.