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

2020-06-01 Thread Martin Liška
On 5/30/20 11:38 PM, Jakub Jelinek via Gcc wrote: 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 branc

Re: [IMPORTANT] ChangeLog related changes

2020-06-01 Thread Martin Liška
On 5/31/20 10:27 PM, Segher Boessenkool wrote: On Tue, May 26, 2020 at 03:14:02PM +0200, Andreas Schwab wrote: On Mai 26 2020, Martin Liška wrote: subprocess.check_output('git show --name-only --pretty="" | ' 'grep ChangeLog | ' git show --name-only

Name change in dumpfiles

2020-06-01 Thread Thomas Koenig via Gcc
Hi, I just noticed that the convention for dump file names appears to have changed. Previously, "gfortran -fdump-tree-original hello.f90" resulted in the file hello.f90.004t.original being generated, now it is a-hello.f90.004t.original . I assume this is intentional. Does the letter prefix stan

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

2020-06-01 Thread Thomas Koenig via Gcc
Hi Martin, For now, I would recommend doing 1:1 backports. Otherwise, you'll need to merge all ChangeLog entries in a format the server hook accepts. That can require some work. If the first commit caused a regression, which the second one fixed, this would keep the first regression, right?

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

2020-06-01 Thread Jonathan Wakely via Gcc
On Mon, 1 Jun 2020 at 12:56, Thomas Koenig wrote: > > Hi Martin, > > > For now, I would recommend doing 1:1 backports. Otherwise, you'll need > > to merge > > all ChangeLog entries in a format the server hook accepts. That can > > require some > > work. > > If the first commit caused a regression,

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

2020-06-01 Thread Thomas Koenig via Gcc
Am 01.06.20 um 14:20 schrieb Jonathan Wakely via Gcc: It will only "keep" it for a matter of seconds, between that backported commit and the backported fix. And unless you push the first commit before pushing the fix, nobody will ever see the regression without also seeing the fix (unless they sp

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

2020-06-01 Thread Jonathan Wakely via Gcc
On Mon, 1 Jun 2020 at 13:25, Thomas Koenig wrote: > > Am 01.06.20 um 14:20 schrieb Jonathan Wakely via Gcc: > > It will only "keep" it for a matter of seconds, between that > > backported commit and the backported fix. And unless you push the > > first commit before pushing the fix, nobody will ev

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

2020-06-01 Thread Iain Sandoe via Gcc
Jonathan Wakely via Gcc wrote: On Mon, 1 Jun 2020 at 13:25, Thomas Koenig wrote: Am 01.06.20 um 14:20 schrieb Jonathan Wakely via Gcc: It will only "keep" it for a matter of seconds, between that backported commit and the backported fix. And unless you push the first commit before pushing th

Re: Name change in dumpfiles

2020-06-01 Thread Martin Liška
On 6/1/20 1:49 PM, Thomas Koenig via Gcc wrote: Hi, I just noticed that the convention for dump file names appears to have changed. Previously, "gfortran -fdump-tree-original hello.f90" resulted in the file hello.f90.004t.original being generated, now it is a-hello.f90.004t.original . I assume

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

2020-06-01 Thread Andreas Schwab
On Jun 01 2020, Jonathan Wakely via Fortran wrote: > On Mon, 1 Jun 2020 at 13:25, Thomas Koenig wrote: >> >> Am 01.06.20 um 14:20 schrieb Jonathan Wakely via Gcc: >> > It will only "keep" it for a matter of seconds, between that >> > backported commit and the backported fix. And unless you push t

Re: [IMPORTANT] ChangeLog related changes

2020-06-01 Thread Jonathan Wakely via Gcc
On Mon, 25 May 2020 at 23:50, Jakub Jelinek via Gcc wrote: > > Hi! > > I've turned the strict mode of Martin Liška's hook changes, > which means that from now on no commits to the trunk or release branches > should be changing any ChangeLog files together with the other files, > ChangeLog entry sh

sign_and_send_pubkey: signing failed: agent refused operation

2020-06-01 Thread Martin Sebor via Gcc
git pull from the GCC and Glibc repos is failing for me with the error below. It worked fine last week and I haven't made any changes to my ssh keys. Is this a transient glitch or has something changed recently that I need to make some adjustments for? sign_and_send_pubkey: signing failed: agen

Re: sign_and_send_pubkey: signing failed: agent refused operation

2020-06-01 Thread Frank Ch. Eigler via Gcc
Hi - > git pull from the GCC and Glibc repos is failing for me with the error > below. It worked fine last week and I haven't made any changes to my > ssh keys. And are you logging in from the same workstation with access to the same set of ssh private keys? > Is this a transient glitch or has

Re: sign_and_send_pubkey: signing failed: agent refused operation

2020-06-01 Thread Jonathan Wakely via Gcc
On Mon, 1 Jun 2020 at 19:11, Frank Ch. Eigler via Gcc wrote: > > Hi - > > > git pull from the GCC and Glibc repos is failing for me with the error > > below. It worked fine last week and I haven't made any changes to my > > ssh keys. > > And are you logging in from the same workstation with acces

Re: sign_and_send_pubkey: signing failed: agent refused operation

2020-06-01 Thread Martin Sebor via Gcc
On 6/1/20 12:10 PM, Frank Ch. Eigler wrote: Hi - git pull from the GCC and Glibc repos is failing for me with the error below. It worked fine last week and I haven't made any changes to my ssh keys. And are you logging in from the same workstation with access to the same set of ssh private k

Re: sign_and_send_pubkey: signing failed: agent refused operation

2020-06-01 Thread Jonathan Wakely via Gcc
On Mon, 1 Jun 2020 at 20:16, Martin Sebor via Gcc wrote: > > On 6/1/20 12:10 PM, Frank Ch. Eigler wrote: > > Hi - > > > >> git pull from the GCC and Glibc repos is failing for me with the error > >> below. It worked fine last week and I haven't made any changes to my > >> ssh keys. > > > > And ar

Re: sign_and_send_pubkey: signing failed: agent refused operation

2020-06-01 Thread Martin Sebor via Gcc
On 6/1/20 1:25 PM, Jonathan Wakely wrote: On Mon, 1 Jun 2020 at 20:16, Martin Sebor via Gcc wrote: On 6/1/20 12:10 PM, Frank Ch. Eigler wrote: Hi - git pull from the GCC and Glibc repos is failing for me with the error below. It worked fine last week and I haven't made any changes to my ss

Re: sign_and_send_pubkey: signing failed: agent refused operation

2020-06-01 Thread Frank Ch. Eigler via Gcc
Hi - > ~/.ssh/known_hosts exists and ~/.ssh is rwx only by the owner. > Everything works fine if I add my key by running ssh-add. What's > not so great is the errors I get when I forget to do that: "agent > refused operation?" Yeah, there is something odd on your side. Maybe your ssh client is

Re: sign_and_send_pubkey: signing failed: agent refused operation

2020-06-01 Thread Jonathan Wakely via Gcc
On Mon, 1 Jun 2020 at 20:46, Martin Sebor wrote: > > On 6/1/20 1:25 PM, Jonathan Wakely wrote: > > On Mon, 1 Jun 2020 at 20:16, Martin Sebor via Gcc wrote: > >> > >> On 6/1/20 12:10 PM, Frank Ch. Eigler wrote: > >>> Hi - > >>> > git pull from the GCC and Glibc repos is failing for me with th

Re: sign_and_send_pubkey: signing failed: agent refused operation

2020-06-01 Thread Martin Sebor via Gcc
On 6/1/20 1:53 PM, Frank Ch. Eigler wrote: Hi - ~/.ssh/known_hosts exists and ~/.ssh is rwx only by the owner. Everything works fine if I add my key by running ssh-add. What's not so great is the errors I get when I forget to do that: "agent refused operation?" Yeah, there is something odd o

Re: [IMPORTANT] ChangeLog related changes

2020-06-01 Thread Martin Liška
On 6/1/20 7:24 PM, Jonathan Wakely wrote: On Mon, 25 May 2020 at 23:50, Jakub Jelinek via Gcc wrote: Hi! I've turned the strict mode of Martin Liška's hook changes, which means that from now on no commits to the trunk or release branches should be changing any ChangeLog files together with th