Re: [RFC/PATCH] rebase: add -x option to record original commit name

From: Jay Soffian <jaysoffian@gmail.com>
Date: Feb 6, 2010, 01:58 UTC
Message-ID: <76718491002051758s577d8b5eq2323cd66d479662@mail.gmail.com>
In-Reply-To: <7vzl3ngn7w.fsf@alter.siamese.dyndns.org>

On Fri, Feb 5, 2010 at 8:35 PM, Junio C Hamano <gitster@pobox.com> wrote:

> In the longer term, we would rather deprecate -x from cherry-pick, so that
> we won't contaminate the commit log message.

Well now that's interesting. I am in the process of back porting a large amount of development, and it seems very useful to record this information in the log message. The subject messages are not always unique, so it's provides a very easy to find the original commit.

I know you can use "git cherry" to look for identical commits, but I'm actually adding the "(cherry picked from ...)" especially for when the new commit is not identical, so that I can then easily emit interdiffs. I want to make sure that the backported work is as true to the original branch as possible, and it's much easier to compare commit by commit than the end product.

Show 6 quoted lines

> So in that sense, I would give a mildly negative response to this patch.
>
> We might instead want to add a hook that is called from cherry-pick (and
> rebase will get a similar one) immediately after the command creates a new
> commit out of another commit, so that people can record the correspondence
> in notes namespace if they choose to.

Hmfph. So I know some folks don't like polluting log messages (e.g., the git-svn-id footer, or apparently, the cherry-pick -x message), but I actually prefer having this data embedded there than hidden in notes.

j.