Git rejecting branch merge

[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 repository.
> > > 
> > > Since 03e87724864a17e22c9b692cc0caa014e9dba6b1 has been in the repository 
> > > (on master) since before GCC 10 branched, something must be going wrong 
> > > for a push to be rejected based on a check of that commit.
> > 
> > OK. Can you create a tarball of the GCC's bare repository as it is now,
> > and give me access to both this tarball and the branch that the user
> > was trying to update, I can try to spend a bit of time this weekend
> > trying to reproduce and then investigating it. And just for the avoidance
> > of doubt, if I could get the git command that was used to attempt
> > the push, this would avoid wasting time investigating the wrong thing.
> 
> It's /git/gcc.git on sourceware (I think you have shell access, or can git 
> clone --mirror to get a full bare copy).  
> refs/users/hubicka/heads/honza-gcc-benchmark-branch currently points to 
> c478047c0fd71e8bd8e069c729b57a89b75ee004, "Add changelog".  I don't know 
> exactly what Honza is pushing there (whether it's a merge or a rebase), 
> but whatever he's pushing, the hook should not be checking commits that 
> are already in the repository.

I did the following (and perhaps you can do it for me)

git branch -D me/honza-gcc-benchmark-branch
git checkout master
git co -b me/honza-gcc-benchmark-branch
git push -f

Which I hope should replace the existing (old) branch by a copy of
current trunk on which I could do more of tuning tests.

Honza
> 
> -- 
> Joseph S. Myers
> joseph@codesourcery.com