Re: Git rejecting branch merge

2020-10-05 Thread Joel Brobecker
> > > I wonder I can get the branch moved, so I can do the benchmarking :) > > > Any suggestions how to do that? > > I just installed a small patch, hot-fix style which I am hoping will > fix your problem. Can you try it? It passes the testsuite, so the change > should be safe. And now, the fix t

Re: Git rejecting branch merge

2020-10-02 Thread Joel Brobecker
> Which is what Joseph said, I think. The problem was that the > update_hook script still gets called for branch deletions, and it was > rejecting them. My fix was just to stop rejecting them: > > Author: Jonathan Wakely > Date: Thu Oct 1 18:04:54 2020 + > >Do not check anything for re

Re: Git rejecting branch merge

2020-10-02 Thread Jonathan Wakely via Gcc
On Fri, 2 Oct 2020 at 13:19, Joel Brobecker wrote: > > > > I can confirm I was able to delete a branch on remove server: > > > > > > $ git push origin --delete refs/users/marxin/heads/gfc-trailing-spec > > > To git+ssh://gcc.gnu.org/git/gcc.git > > > - [deleted] refs/users/marxin

Re: Git rejecting branch merge

2020-10-02 Thread Joel Brobecker
> > I can confirm I was able to delete a branch on remove server: > > > > $ git push origin --delete refs/users/marxin/heads/gfc-trailing-spec > > To git+ssh://gcc.gnu.org/git/gcc.git > > - [deleted] refs/users/marxin/heads/gfc-trailing-spec > > That's because I fixed GCC's hook

Re: Git rejecting branch merge

2020-10-02 Thread Jonathan Wakely via Gcc
On Fri, 2 Oct 2020 at 08:14, Martin Liška wrote: > > On 10/2/20 2:52 AM, Joel Brobecker wrote: > >>> I wonder I can get the branch moved, so I can do the benchmarking :) > >>> Any suggestions how to do that? > > > > I just installed a small patch, hot-fix style which I am hoping will > > fix your p

Re: Git rejecting branch merge

2020-10-02 Thread Martin Liška
On 10/2/20 2:52 AM, Joel Brobecker wrote: I wonder I can get the branch moved, so I can do the benchmarking :) Any suggestions how to do that? I just installed a small patch, hot-fix style which I am hoping will fix your problem. Can you try it? It passes the testsuite, so the change should be

Re: Git rejecting branch merge

2020-10-01 Thread Joel Brobecker
> > I wonder I can get the branch moved, so I can do the benchmarking :) > > Any suggestions how to do that? I just installed a small patch, hot-fix style which I am hoping will fix your problem. Can you try it? It passes the testsuite, so the change should be safe. Let me know how it goes. I wil

Re: Git rejecting branch merge

2020-10-01 Thread Joel Brobecker
> I wonder I can get the branch moved, so I can do the benchmarking :) > Any suggestions how to do that? Unfortunately, I think the only way (sort of adding the suggested workaround in the commit-extra-checker script), is to update the branch directly in the bare repository on sourceware.org. This

Re: Git rejecting branch merge

2020-10-01 Thread Jan Hubicka
> > So, IIUC, you're trying to replace the old > > refs/users/hubicka/heads/honza-gcc-benchmark-branch > > with whatever is on master at this moment, is that correct > > (that would wipe whatever changes you've made in your old > > branch)? > > > > For instance, currently master is pointing to com

Re: Git rejecting branch merge

2020-09-29 Thread Jan Hubicka
> On Tue, Sep 29, 2020 at 07:16:45PM +0200, Jan Hubicka wrote: > > > On Tue, 29 Sep 2020, Joel Brobecker wrote: > > > > > > > > > That's correct. The commit-extra-checker is called using the same > > > > > > list > > > > > > of "added commits" as the other checks implemented in the hooks, and > >

Re: Git rejecting branch merge

2020-09-29 Thread Joel Brobecker
On Tue, Sep 29, 2020 at 07:16:45PM +0200, Jan Hubicka wrote: > > On Tue, 29 Sep 2020, Joel Brobecker wrote: > > > > > > > That's correct. The commit-extra-checker is called using the same list > > > > > of "added commits" as the other checks implemented in the hooks, and > > > > > that list exclud

Re: Git rejecting branch merge

2020-09-29 Thread Jan Hubicka
> On Tue, 29 Sep 2020, Joel Brobecker wrote: > > > > > That's correct. The commit-extra-checker is called using the same list > > > > of "added commits" as the other checks implemented in the hooks, and > > > > that list excludes all commits accessible from existing references > > > > in the repos

Re: Git rejecting branch merge

2020-09-29 Thread Joseph Myers
On Tue, 29 Sep 2020, Joel Brobecker wrote: > > > That's correct. The commit-extra-checker is called using the same list > > > of "added commits" as the other checks implemented in the hooks, and > > > that list excludes all commits accessible from existing references > > > in the repository. > >

Re: Git rejecting branch merge

2020-09-29 Thread Joel Brobecker
On Tue, Sep 29, 2020 at 10:01:23AM -0700, Joel Brobecker wrote: > > > That's correct. The commit-extra-checker is called using the same list > > > of "added commits" as the other checks implemented in the hooks, and > > > that list excludes all commits accessible from existing references > > > in t

Re: Git rejecting branch merge

2020-09-29 Thread Joel Brobecker
> > That's correct. The commit-extra-checker is called using the same list > > of "added commits" as the other checks implemented in the hooks, and > > that list excludes all commits accessible from existing references > > in the repository. > > Since 03e87724864a17e22c9b692cc0caa014e9dba6b1 has b

Re: Git rejecting branch merge

2020-09-29 Thread Joseph Myers
On Tue, 29 Sep 2020, Joel Brobecker wrote: > > > The problem is that the push fails witih: > > > > > > remote: *** The following commit was rejected by your > > > hooks.commit-extra-checker script (status: 1) > > > remote: *** commit: 03e87724864a17e22c9b692cc0caa014e9dba6b1 > > > remote: *** Th

Re: Git rejecting branch merge

2020-09-29 Thread Joel Brobecker
> > The problem is that the push fails witih: > > > > remote: *** The following commit was rejected by your > > hooks.commit-extra-checker script (status: 1) > > remote: *** commit: 03e87724864a17e22c9b692cc0caa014e9dba6b1 > > remote: *** The first line of a commit message should be a short > > d

Re: Git rejecting branch merge

2020-09-29 Thread Joseph Myers
On Tue, 29 Sep 2020, Jan Hubicka wrote: > Hello, > I am trying to update me/honza-gcc-benchmark-branch to current trunk > which I do by deleting it, recreating locally and pushing out. > > The problem is that the push fails witih: > > remote: *** The following commit was rejected by your > hook

Re: Git rejecting branch merge

2020-09-29 Thread Richard Biener via Gcc
On Tue, Sep 29, 2020 at 11:11 AM Jan Hubicka wrote: > > > On Tue, Sep 29, 2020 at 9:17 AM Jan Hubicka wrote: > > > > > > Hello, > > > I am trying to update me/honza-gcc-benchmark-branch to current trunk > > > which I do by deleting it, recreating locally and pushing out. > > > > > > The problem i

Re: Git rejecting branch merge

2020-09-29 Thread Jan Hubicka
> On Tue, Sep 29, 2020 at 9:17 AM Jan Hubicka wrote: > > > > Hello, > > I am trying to update me/honza-gcc-benchmark-branch to current trunk > > which I do by deleting it, recreating locally and pushing out. > > > > The problem is that the push fails witih: > > > > remote: *** The following commit

Re: Git rejecting branch merge

2020-09-29 Thread Richard Biener via Gcc
On Tue, Sep 29, 2020 at 9:17 AM Jan Hubicka wrote: > > Hello, > I am trying to update me/honza-gcc-benchmark-branch to current trunk > which I do by deleting it, recreating locally and pushing out. > > The problem is that the push fails witih: > > remote: *** The following commit was rejected by y