Re: git-svn rebase screwing up commit messages

From: Sean <seanlkml@sympatico.ca>
Date: Jul 28, 2007, 13:29 UTC
Message-ID: <20070728092914.48f6305c.seanlkml@sympatico.ca>
In-Reply-To: <7vodhwptba.fsf@assigned-by-dhcp.cox.net>

On Sat, 28 Jul 2007 06:10:49 -0700 Junio C Hamano <gitster@pobox.com> wrote:

Show 7 quoted lines

> In short, your original commit log message is broken.
> 
> The recommended convention for commit messages is to start it
> with a single line that describes what it does, followed by a
> blank line (i.e. the first paragraph consists of a single line),
> followed by a longer explanation of why the change brought by
> the commit is a good thing.

That explains why I hadn't seen the problem before, since I usually follow the commit message convention. For testing purposes I had simply mashed the home row to add five or six lines without thinking...

Show 9 quoted lines

> Following this convention is recommended to make other peoples'
> lives more pleasant, and git assumes you follow this convention
> at several places.  For example, "git log --pretty=oneline",
> "git reflog", and "git show-branch" are ways to get concise
> listing of commits; git-shortlog gives the list of such commit
> titles in its output, omitting the longer explanation.  Patches
> prepared for e-mail exchange ("git format-patch", and
> --pretty=email) use the title on the Subject: line of the
> message.

Yes, Bisecting shows this "problem" was introduced in your commit 4234a76167 which mentions that commit messages following the normal convention would be unaffected.

...[SNIPPED]...

Show 6 quoted lines

> Having said all that, so that the readers understand the
> background, here is a not-so-heavily-tested patch, which might
> help.  It passes all the test suite as before, but that tells
> how existing git-svn tests do not test many things.
> 
> I am not considering this for inclusion right now, by the way.

FWIW your patch fixed my test case here.

Cheers, Sean