GCC trunk commit a325bdd195ee96f826b208c3afb9bed2ec077e12

[Peter Bergner]

On 6/16/21 1:32 PM, Uros Bizjak wrote:
> On Wed, Jun 16, 2021 at 6:08 PM Liu Hao <lh_mouse@126.com> wrote:
>> It looks like Uroš was on 00d07ec6e12, committed his changes mistakenly with `git commit --amend`
>> (which changed the commit message but did not reset the author), then rebased the modified commit
>> onto ee52bf609bac. Git is smart enough to drop duplicate changes, but the leftovers formed a new
>> commit, which was exactly a325bdd195e.
> 
> Indeed, IIRC - contrib/gcc_update failed due to the unresolved merge,
> and I changed my commit with --amend. There were some issues, but I
> was under the impression that I fixed them. It looks like I forgot
> something, so the result is the commit with wrong author attribution.
> 
> Perhaps a notice in the documentation should be added what to do if
> contrib/gcc_update fails, or perhaps this script should be made more
> robust.

I admit, that if the same thing happened to me, I would have made the
same mistake...or worse :-), so yeah, a comment about what to do to "fix"
things when gcc_update fails would be greatly appreciated by me too!

Peter