This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Question about git: merging to gccgo branch
- From: Ian Lance Taylor <iant at golang dot org>
- To: GCC Development <gcc at gcc dot gnu dot org>
- Date: Wed, 22 Jan 2020 10:22:18 -0800
- Subject: Question about git: merging to gccgo branch
I'm trying to merge trunk revision
7c46e71d016c86971ac26c6fa38d76482859f296 to the gccgo branch. I did
this by checking out the branch ("git checkout origin/devel/gccgo")
and running "git merge master".
I'm not sure whether I should keep reporting this kind of operation to
gcc-patches now that we've switched to git, but that is not my
question.
After testing the result of "git merge master", I run "git push origin
HEAD:devel/gccgo" to push the result to gcc.gnu.org. That fails with
this:
git push origin HEAD:devel/gccgo
Enumerating objects: 4069, done.
Counting objects: 100% (3017/3017), done.
Delta compression using up to 8 threads
Compressing objects: 100% (1517/1517), done.
Writing objects: 100% (1692/1692), 1.37 MiB | 4.58 MiB/s, done.
Total 1692 (delta 1163), reused 154 (delta 113), pack-reused 0
remote: Resolving deltas: 100% (1163/1163), completed with 979 local objects.
remote: *** This update introduces too many new commits (581), which would
remote: *** trigger as many emails, exceeding the current limit (100).
remote: *** Contact your repository adminstrator if you really meant
remote: *** to generate this many commit emails.
remote: error: hook declined to update refs/heads/devel/gccgo
To git+ssh://gcc.gnu.org/git/gcc
! [remote rejected] HEAD -> devel/gccgo (hook declined)
error: failed to push some refs to 'git+ssh://ian@gcc.gnu.org/git/gcc'
I don't want to send 581 e-mails. I would be happy not sending any
e-mails at all. I would also be happy sending 1 e-mail.
What should I do?
Thanks.
Ian