infra-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Akira Ajisaka (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (INFRA-18277) Cannot rebase the branch that has 50+ new commits
Date Thu, 25 Apr 2019 08:24:00 GMT

    [ https://issues.apache.org/jira/browse/INFRA-18277?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16825855#comment-16825855
] 

Akira Ajisaka commented on INFRA-18277:
---------------------------------------

Hi Gavin,
I spoke to the maintainers of HDFS-13891 before force-pushing. I could rebase and force-pushed
the branch on Apr 4. (https://github.com/apache/hadoop/commits/HDFS-13891, https://github.com/apache/hadoop/commit/2577e3e921b61f6c05c2d8f5d3230f014c86abb1)

> Cannot rebase the branch that has 50+ new commits
> -------------------------------------------------
>
>                 Key: INFRA-18277
>                 URL: https://issues.apache.org/jira/browse/INFRA-18277
>             Project: Infrastructure
>          Issue Type: Bug
>          Components: GitBox
>            Reporter: Akira Ajisaka
>            Priority: Major
>
> I successfully rebased HDFS-13891 branch and force-push to GitBox but failed in GitHub.
They are now inconsistent.
> {noformat}
> $ git checkout HDFS-13891
> $ git rebase origin/trunk
> $ git push -f
> Enumerating objects: 1730, done.
> Counting objects: 100% (1730/1730), done.
> Delta compression using up to 4 threads
> Compressing objects: 100% (506/506), done.
> Writing objects: 100% (1598/1598), 285.29 KiB | 10.97 MiB/s, done.
> Total 1598 (delta 707), reused 1397 (delta 576)
> remote: remote: error: GH006: Protected branch update failed for refs/heads/HDFS-13891.
       
> remote: remote: error: Cannot force-push to a protected branch        
> remote: To git@github:apache/hadoop.git
> remote:  ! [remote rejected] d689f6e493267afe12b9d01daa012307bff2aac9 -> HDFS-13891
(protected branch hook declined)
> remote: error: failed to push some refs to 'git@github:apache/hadoop.git'
> remote: Syncing refs/heads/HDFS-13891 (FORCED)...
> remote: Error: 'NoneType' object has no attribute 'decode'
> remote: Sending notification emails to: ['"common-commits@hadoop.apache.org" <common-commits@hadoop.apache.org>']
> remote: *** Too many new commits (57), not sending commit emails.
> remote: *** Try setting multimailhook.maxCommitEmails to a greater value
> remote: *** Currently, multimailhook.maxCommitEmails=50
> remote: Error running hook: /x1/gitbox/hooks/post-receive.d/01-sync-repo.py
> To https://gitbox.apache.org/repos/asf/hadoop.git
>  + 55f2f7aa266...d689f6e4932 HDFS-13891 -> HDFS-13891 (forced update)
> {noformat}



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Mime
View raw message