[1-800-GIT-HELP] Backporting a series of commits into a combined commit?

[Harald Anlauf]

Dear experts,

let's assume I need to backport a series of commits on master to a release 
branch.
In the release branch, this series of commits should become a single commit.

With bare git, there is "cherry-pick -n" that seems to be applicable.

What is the right way to do it for gcc?

Thanks,
Harald

Re: [1-800-GIT-HELP] Backporting a series of commits into a combined commit?

[Jonathan Wakely via Gcc]

On Sat, 30 May 2020 at 21:09, Harald Anlauf  wrote:
>
> Dear experts,
>
> let's assume I need to backport a series of commits on master to a release 
> branch.
> In the release branch, this series of commits should become a single commit.
>
> With bare git, there is "cherry-pick -n" that seems to be applicable.
>
> What is the right way to do it for gcc?

I do it with cherry-pick -n.

Or you can cherry-pick each one, then do git rebase --interactive to
squash them all into one.

Re: [1-800-GIT-HELP] Backporting a series of commits into a combined commit?

[Jakub Jelinek via Gcc]

On Sat, May 30, 2020 at 09:35:05PM +0100, Jonathan Wakely via Gcc wrote:
> On Sat, 30 May 2020 at 21:09, Harald Anlauf  wrote:
> >
> > Dear experts,
> >
> > let's assume I need to backport a series of commits on master to a release 
> > branch.
> > In the release branch, this series of commits should become a single commit.
> >
> > With bare git, there is "cherry-pick -n" that seems to be applicable.
> >
> > What is the right way to do it for gcc?
> 
> I do it with cherry-pick -n.
> 
> Or you can cherry-pick each one, then do git rebase --interactive to
> squash them all into one.

I guess another question is what will Martin's gcc-changelog script do with
that, but there is a way to invoke it and ask what it would add.

Jakub

gcc-10-20200530 is now available

[GCC Administrator via Gcc]

Snapshot gcc-10-20200530 is now available on
  https://gcc.gnu.org/pub/gcc/snapshots/10-20200530/
and on various mirrors, see http://gcc.gnu.org/mirrors.html for details.

This snapshot has been generated from the GCC 10 git branch
with the following options: git://gcc.gnu.org/git/gcc.git branch 
releases/gcc-10 revision 6632f2920f08f5b45ffd1ada7006d4591ef9b172

You'll find:

 gcc-10-20200530.tar.xz   Complete GCC

  SHA256=3b73dd31bd3bfeb6080a47e2e7bd41b618d19666da39af5078e1b6d1170903cc
  SHA1=0b711eda3b623f1c02290eb6d3a1641d1916fa64

Diffs from 10-20200523 are available in the diffs/ subdirectory.

When a particular snapshot is ready for public consumption the LATEST-10
link is updated and a message is sent to the gcc list.  Please do not use
a snapshot before it has been announced that way.