git cherry-pick -x

git cherry-pick -x

[Eli Zaretskii]

What are the views here on using the -x switch to git cherry-pick,
when cherry-picking commits from master to a release branch?  Is that
deemed useful?  If so, should we always use it?

TIA

Re: git cherry-pick -x

[Joel Brobecker]

> What are the views here on using the -x switch to git cherry-pick,
> when cherry-picking commits from master to a release branch?  Is that
> deemed useful?  If so, should we always use it?

My personal view on this is that I have never found the extra message
to be all that useful to have, but I don't mind them.  Watch out for
one little nit: If the revision log is a single-line log, then the
extra info is added right after it, breaking the convention that the
second line of revision logs should always be empty.

-- 
Joel

Re: git cherry-pick -x

[Eli Zaretskii]

> Date: Mon, 21 Apr 2014 09:06:51 -0700
> From: Joel Brobecker <brobecker@adacore.com>
> Cc: gdb-patches@sourceware.org
> 
> Watch out for one little nit: If the revision log is a single-line
> log, then the extra info is added right after it, breaking the
> convention that the second line of revision logs should always be
> empty.

Don't we always include the ChangeLog entries after the 1st line of
the commit message?

Re: git cherry-pick -x

[Joel Brobecker]

> > Watch out for one little nit: If the revision log is a single-line
> > log, then the extra info is added right after it, breaking the
> > convention that the second line of revision logs should always be
> > empty.
> 
> Don't we always include the ChangeLog entries after the 1st line of
> the commit message?

Right - something I meant to say, that it's likely not going to affect
us, except in unusual situations maybe.

-- 
Joel