Can't push updates to my own fork

I believe I may have merged other MRs in the meanwhile, and this could be the manifestation of a conflict. @malowe may know how we can debug this one in more detail.

I believe I may have merged other MRs in the meanwhile[...]

You did push MRs in the meanwhile. Not a git conflict here (perhaps another kind of conflict?), as what I am trying to do is update my fork with the upstream version of the code.

I'm double-checking with a file search, but I think this is a difference in how GitLab works vs GH rather than the ECA. They seem to have much more strict OOTB rules around pushing data. Looking around online, there are 2 fixes to this, either loosening the Push Rules on the fork or to set up a special feature for GitLab called Repo Mirroring (which updates your copy of the repo auto-magically).

https://superuser.com/questions/1419625/gitlab-you-cannot-push-commits-for-you-can-only-push-commits-that-were-commit https://about.gitlab.com/blog/2016/12/01/how-to-keep-your-fork-up-to-date-with-its-origin/

Thanks @malowe for looking into this. The mirroring says "Mirror settings are only available to GitLab administrators." And even with that I think there are certainly some issues, however I don't know which issues are related to gitlab and github just being different.

One of the big differences in a gitlab fork it that it isn't "mine" like a github fork is. i.e. in a github fork I can add whatever I want to it, but as the gitlab fork is still under https://gitlab.eclipse.org the ownership of that fork is different.

The https://docs.gitlab.com/ee/push_rules/push_rules.html seem relevant here. Hopefully there is a way to specify a push rule that allows commits in the upstream (or any other fork ideally) to be pushed to my fork. If it is any other fork then it means that all commits ending up on any fork came from a legitimate (authorized) author, but then those commits could be mixed and matched however I want them to be.

Are there any updates on this topic? I am having the same problem when updating my fork with changes that happened meanwhile in the original repository. Obviously there are commits in the merge commit that originate from other committers in the project. However, i need to merge and push those to my fork.

@droy Is this issue still under investigation? An update would be great. Thanks!

There seems to be two email addresses there. If your push contains a commit that uses a second email address that is not knowm to us, it will fail.

Just to make sure I understand you correctly: I am using my email address (arun.das@bmw.de) while the error message states that i can't push changes for "reinhard.biegel@in-tech.com". I guess these are the two email addresses you're referring to, right? The reason why there are commits from Reinhard is that I updated my local version of my fork and wanted to push it to the remote fork. The commits causing the problem have originally been committed to the official simopenpass repo and now have to be merged into my fork.

@droy AFAICT this problem only occurs for contributors (not committers) on a project when trying to update their own fork with new commits added to the main repo.

@adascri IIRC the workaround is to delete your fork, re-fork it and then push your change.

@droy It might be worth updating this push rule on the server. This is covered by the ECA check currently and causes issues on forks and non managed projects with push rights.

Committer restriction
Users can only push commits to this repository that were committed with one of their own verified emails. This setting is applied on the server level and can be overridden by an admin. Contact an admin to change this setting.

@malowe Thanks! I've removed the push rule. @jograham does this solve it for you?

@droy no, still cannot push to my fork:

remote: GitLab: You cannot push commits for 'chris.guindon@eclipse-foundation.org'. You can only push commits that were committed with one of your own verified emails.

full log of my session (note that commit ecfecda was origin/main when I made the fork that I now cannot push to):

$ git fetch origin ; git fetch jonah

$ git log --oneline --graph -5
*   5b51a03 (HEAD -> main, origin/main, origin/HEAD) Merge branch 'typo' into 'main'
|\  
| * c541e1b (jonah/typo) Fix typo I introduced in last commit
|/  
*   ecfecda (jonah/main) Merge branch 'main' into 'main'
|\  
| * dda121f my personal notes
|/  
*   f9df267 Merge branch 'main' into 'main'
|\  

$ git remote -v
jonah	git@gitlab.eclipse.org:jograham/memorials.git (fetch)
jonah	git@gitlab.eclipse.org:jograham/memorials.git (push)
origin	git@gitlab.eclipse.org:eclipsefdn/memorials.git (fetch)
origin	git@gitlab.eclipse.org:eclipsefdn/memorials.git (push)

$ git push jonah HEAD:main
Enumerating objects: 6, done.
Counting objects: 100% (6/6), done.
Delta compression using up to 8 threads
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 641 bytes | 641.00 KiB/s, done.
Total 4 (delta 2), reused 0 (delta 0)
remote: GitLab: You cannot push commits for 'chris.guindon@eclipse-foundation.org'. You can only push commits that were committed with one of your own verified emails.
To gitlab.eclipse.org:jograham/memorials.git
 ! [remote rejected] HEAD -> main (pre-receive hook declined)
error: failed to push some refs to 'git@gitlab.eclipse.org:jograham/memorials.git'

I wonder if this setting takes time to apply. Everything I see points to that setting.

It looks like what changing the setting did was remove the forced state for projects, rather than change all existing projects. I'd bet if we made new projects, it would likely be disabled. For current projects though, you'll need to disable the rule. If you are a maintainer, you should be able to change these settings. For forks, if you own it you should be a maintainer even if you aren't on the project (since it's your fork).

@jograham @adascri If you go to the Settings > Repository > Push rules, you should be able to uncheck Committer restriction now and save the changes. For actual projects, we may need some admin massage as no one but webmaster has maintainer on projects (as far as I know?). We're looking at changing that, but it will take some time

Thanks @malowe - that did it, I pushed successfully.

Thanks for all the sleuthing, @malowe

I suppose new (from now) forks will not have this rule. Closing this one.

closed

Can't push updates to my own fork

Designs

Child items ...

Activity