On Wed, May 20, 2020 at 7:23 AM Martin Liška <mli...@suse.cz> wrote:
>
> On 5/20/20 3:57 PM, H.J. Lu wrote:
> > On Wed, May 20, 2020 at 6:55 AM Martin Liška <mli...@suse.cz> wrote:
> >>
> >> On 5/20/20 3:48 PM, H.J. Lu wrote:
> >>> On Wed, May 20, 2020 at 6:47 AM Martin Liška <mli...@suse.cz> wrote:
> >>>>
> >>>> On 5/20/20 1:31 PM, H.J. Lu wrote:
> >>>>> On Wed, May 20, 2020 at 1:40 AM Martin Liška <mli...@suse.cz> wrote:
> >>>>>>
> >>>>>> On 5/20/20 12:59 AM, H.J. Lu wrote:
> >>>>>>> I got:
> >>>>>>>
> >>>>>>> $ git push origin releases/gcc-10
> >>>>>>> Enumerating objects: 15, done.
> >>>>>>> Counting objects: 100% (15/15), done.
> >>>>>>> Delta compression using up to 8 threads
> >>>>>>> Compressing objects: 100% (6/6), done.
> >>>>>>> Writing objects: 100% (8/8), 1.15 KiB | 1.15 MiB/s, done.
> >>>>>>> Total 8 (delta 7), reused 2 (delta 2), pack-reused 0
> >>>>>>> remote: *** ChangeLog format failed:
> >>>>>>> remote: ERR: line should start with a tab:"(cherry picked from commit
> >>>>>>> 453954451be68d22462442268a29f54809182d2b)"
> >>>>>>> remote: ERR: could not deduce ChangeLog file
> >>>>>>> remote:
> >>>>>>> remote: Please see: 
> >>>>>>> https://gcc.gnu.org/codingconventions.html#ChangeLogs
> >>>>>>> remote:
> >>>>>>> remote: error: hook declined to update refs/heads/releases/gcc-10
> >>>>>>> To ssh://gcc.gnu.org/git/gcc.git
> >>>>>>>      ! [remote rejected]         releases/gcc-10 -> releases/gcc-10 
> >>>>>>> (hook declined)
> >>>>>>> error: failed to push some refs to 
> >>>>>>> 'ssh://h...@gcc.gnu.org/git/gcc.git'
> >>>>>>>
> >>>>>>> My cherry-pick commit message has
> >>>>>>>
> >>>>>>> (cherry picked from commit 453954451be68d22462442268a29f54809182d2b)
> >>>>>>>
> >>>>>>> Shouldn't it be allowed?
> >>>>>>>
> >>>>>>
> >>>>>> Hello.
> >>>>>>
> >>>>>> It is fixed now, please try to push the commit.
> >>>>>>
> >>>>>> Martin
> >>>>>
> >>>>> I got
> >>>>>
> >>>>> remote: *** ChangeLog format failed:
> >>>>> remote: ERR: line should start with a tab:"(cherry picked from commit
> >>>>> 1e46a443f25d26816536c0c480211714b123a1d5)"
> >>>>> remote: ERR: could not deduce ChangeLog file
> >>>>>
> >>>>
> >>>> Can you please send me the patch via email (git format-patch)?
> >>>>
> >>>
> >>> Here.
> >>>
> >>
> >> Which branch do you want to push it to?
> >>
> >> Martin
> >
> > git push origin releases/gcc-10
> > Enumerating objects: 13, done.
> > Counting objects: 100% (13/13), done.
> > Delta compression using up to 8 threads
> > Compressing objects: 100% (7/7), done.
> > Writing objects: 100% (7/7), 844 bytes | 844.00 KiB/s, done.
> > Total 7 (delta 6), reused 0 (delta 0), pack-reused 0
> > remote: *** ChangeLog format failed:
> > remote: ERR: line should start with a tab:"(cherry picked from commit
> > 1e46a443f25d26816536c0c480211714b123a1d5)"
> > remote: ERR: could not deduce ChangeLog file
> > remote:
> > remote: Please see: https://gcc.gnu.org/codingconventions.html#ChangeLogs
> > remote:
> > remote: error: hook declined to update refs/heads/releases/gcc-10
> > To ssh://gcc.gnu.org/git/gcc.git
> >   ! [remote rejected]         releases/gcc-10 -> releases/gcc-10 (hook 
> > declined)
> > error: failed to push some refs to 'ssh://h...@gcc.gnu.org/git/gcc.git'
> >
> >
>
> Thank you, working on that as current git_commit.py script works fine with 
> that.
> Note that we sync the file to GIT hooks I think we're using an older version.
>
> I'll inform you,
> Martin

Now I got
 git push  origin releases/gcc-10
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 8 threads
Compressing objects: 100% (7/7), done.
Writing objects: 100% (7/7), 846 bytes | 846.00 KiB/s, done.
Total 7 (delta 6), reused 0 (delta 0), pack-reused 0
remote: Traceback (most recent call last):
remote:   File "hooks/update.py", line 13, in <module>
remote:     from updates.factory import new_update
remote:   File "/sourceware1/home/gccadmin/git-hooks/hooks/updates/__init__.py",
line 8, in <module>
remote:     from pre_commit_checks import (check_revision_history,
style_check_commit,
remote:   File 
"/sourceware1/home/gccadmin/git-hooks/hooks/pre_commit_checks.py",
line 6, in <module>
remote:     from git_commit import GitCommit
remote: ImportError: No module named git_commit
remote: error: hook declined to update refs/heads/releases/gcc-10
To ssh://gcc.gnu.org/git/gcc.git
 ! [remote rejected]         releases/gcc-10 -> releases/gcc-10 (hook declined)
error: failed to push some refs to 'ssh://h...@gcc.gnu.org/git/gcc.git'

-- 
H.J.

Reply via email to