Re: Error while pushing commits for bug 93240
On Sat, Aug 29, 2015 at 12:21 PM, Daniel danlrobertso...@gmail.com wrote: In general as opposed to merging origin/master you would be better off using rebase origin/master. To add to that: it is not just 'in general' for this project it is a rule. no merge commit. when refreshing you local master always use 'git pull -r' now, Shreyansh: 1/ You _really_ need to spend some time to read a git primer.. there are plenty of them on the internet, text, slideshow, video etc, explaining it in all kind of ways, I'm just you'll find one that resonate with you. 2/ you _really_ need to read what the tools are telling you when you run a command: for example: $ git push --set-upstream origin my_93240 where did you get that from?. this command tell gerrit to push you branch my_93240 to a branch of the same name on origin and remember that association for the next time no surprizingly: To ssh://logerrit/core ! [remote rejected] my_93240 - my_93240 (prohibited by Gerrit) Yes you are prohibited to create random branches on the upstream repo. then ./logerrit submit master [..]] ! [remote rejected] HEAD - refs/for/master (change 9724 closed) even if that does not talk to you google of ! [remote rejected] HEAD - refs/for/master (change 9724 closed) In any case you should really understand what you are trying to push git log --decorate goes a long way. next: git push origin HEAD:master remote: Branch refs/heads/master: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - master (prohibited by Gerrit) you ask again: How should I fix this? by readin the long and clear message: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect you are trying to push directly to master, bypassing gerrit review altogether, of course that is not allowed. finally: git push origin HEAD:refs/for/master [...] ! [remote rejected] HEAD - refs/for/master (you are not allowed to upload merges) yaou said : same result Well again read the message. no it is not the 'same result' not even close. This time you would be allowed to push to the destination you indicated.. but you are trying to push a merge commit, which the message is clearly telling you you are not allowed to do. your subsequent git log show a 'merge commit' and a puzzling 'initial commit' in you history... I have no idea how you got there.. but as the first Law of Holes state: if you find yourself in a hole, stop digging. The random try and error method require that you go back to a known sane state between tries. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Error while pushing commits for bug 93240
Hi, I'm unable to figure out why my commits are not being pushed. *$ git push --set-upstream origin my_93240 * Counting objects: 61, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] my_93240 - my_93240 (prohibited by Gerrit) error: failed to push some refs to 'ssh://logerrit/core' How do I fix this? Regards, Shreyansh -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
This is the output of ./logerrit submit master ./logerrit submit master Counting objects: 64, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - refs/for/master (change 9724 closed) error: failed to push some refs to 'ssh://logerrit/core' -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
*./logerrit submit master* Counting objects: 64, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - refs/for/master (change 9724 closed) error: failed to push some refs to 'ssh://logerrit/core' On Fri, Aug 28, 2015 at 2:51 PM Samuel Mehrbrodt s.mehrbr...@gmail.com wrote: Try ./logerrit submit master Check https://wiki.documentfoundation.org/Development/gerrit for more information. Samuel Am 28.08.2015 um 10:58 schrieb Shreyansh Gandhi: Hi, I'm unable to figure out why my commits are not being pushed. *$ git push --set-upstream origin my_93240 * Counting objects: 61, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] my_93240 - my_93240 (prohibited by Gerrit) error: failed to push some refs to 'ssh://logerrit/core' How do I fix this? Regards, Shreyansh -- Regards, Shreyansh Gandhi ___ LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
Try ./logerrit submit master Check https://wiki.documentfoundation.org/Development/gerrit for more information. Samuel Am 28.08.2015 um 10:58 schrieb Shreyansh Gandhi: Hi, I'm unable to figure out why my commits are not being pushed. *$ git push --set-upstream origin my_93240 * Counting objects: 61, done. Delta compression using up to 4 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (11/11), 1.15 KiB | 0 bytes/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] my_93240 - my_93240 (prohibited by Gerrit) error: failed to push some refs to 'ssh://logerrit/core' How do I fix this? Regards, Shreyansh -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
Hi Shreyansh, On Friday, 2015-08-28 10:07:00 +, Shreyansh Gandhi wrote: ! [remote rejected] HEAD - refs/for/master (change 9724 closed) You are attempting to push a change to gerrit that has the same Change-Id as change number 9724 on gerrit, which happens to be a long closed change, coincidentally authored by you, see https://gerrit.libreoffice.org/9724/ Apparently you recycled the Change-Id in the commit message of your new change, or you are accidentally trying to push the same change again. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack pgpHIDFkOy_9O.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
Hi, On Friday, 2015-08-28 11:21:45 +0200, Samuel Mehrbrodt wrote: Try ./logerrit submit master Be careful though, ./logerrit pushes every change from your local branch that is on top of the origin, which may explain why you had the problem with the closed 9724 change if that commit still lingered on your branch. The git review plugin command checks and warns if more than one change is to be pushed, see git review --help for usage. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack pgpYlD79nc7XP.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
Same result:- git push origin HEAD:refs/for/master Counting objects: 63, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - refs/for/master (you are not allowed to upload merges) error: failed to push some refs to 'ssh://logerrit/core' On Fri, Aug 28, 2015 at 5:41 PM Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey, On Fri, Aug 28, 2015 at 2:10 PM, Shreyansh Gandhi gandhish...@gmail.com wrote: Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Branch refs/heads/master: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - master (prohibited by Gerrit) How should I fix this? -Shreyansh http://lists.freedesktop.org/mailman/listinfo/libreoffice You are not allowed to push to master. Instead you need to use something like git push origin HEAD:refs/for/master which will push it to the review queue. Regards, Markus -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Branch refs/heads/master: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - master (prohibited by Gerrit) How should I fix this? -Shreyansh On Fri, Aug 28, 2015 at 4:43 PM Eike Rathke er...@redhat.com wrote: Hi, On Friday, 2015-08-28 11:21:45 +0200, Samuel Mehrbrodt wrote: Try ./logerrit submit master Be careful though, ./logerrit pushes every change from your local branch that is on top of the origin, which may explain why you had the problem with the closed 9724 change if that commit still lingered on your branch. The git review plugin command checks and warns if more than one change is to be pushed, see git review --help for usage. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
Hey, On Fri, Aug 28, 2015 at 2:10 PM, Shreyansh Gandhi gandhish...@gmail.com wrote: Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Branch refs/heads/master: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - master (prohibited by Gerrit) How should I fix this? -Shreyansh http://lists.freedesktop.org/mailman/listinfo/libreoffice You are not allowed to push to master. Instead you need to use something like git push origin HEAD:refs/for/master which will push it to the review queue. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
On Fri, Aug 28, 2015 at 8:15 AM, Shreyansh Gandhi gandhish...@gmail.com wrote: Same result:- git push origin HEAD:refs/for/master Try replacing HEAD with the branch name. Counting objects: 63, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - refs/for/master (you are not allowed to upload merges) error: failed to push some refs to 'ssh://logerrit/core' On Fri, Aug 28, 2015 at 5:41 PM Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey, On Fri, Aug 28, 2015 at 2:10 PM, Shreyansh Gandhi gandhish...@gmail.com wrote: Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Branch refs/heads/master: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - master (prohibited by Gerrit) How should I fix this? -Shreyansh http://lists.freedesktop.org/mailman/listinfo/libreoffice You are not allowed to push to master. Instead you need to use something like git push origin HEAD:refs/for/master which will push it to the review queue. Regards, Markus -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
Hey, On Fri, Aug 28, 2015 at 4:52 PM, Ashod Nakashian ashnak...@gmail.com wrote: On Fri, Aug 28, 2015 at 8:15 AM, Shreyansh Gandhi gandhish...@gmail.com wrote: Same result:- git push origin HEAD:refs/for/master Try replacing HEAD with the branch name. No. Please read the error message. ( [remote rejected] HEAD - refs/for/master (you are not allowed to upload merges)) You have somewhere a merge commit. Can you pastebin the first lines of git log? Regards, Markus Counting objects: 63, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - refs/for/master (you are not allowed to upload merges) error: failed to push some refs to 'ssh://logerrit/core' On Fri, Aug 28, 2015 at 5:41 PM Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey, On Fri, Aug 28, 2015 at 2:10 PM, Shreyansh Gandhi gandhish...@gmail.com wrote: Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Branch refs/heads/master: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - master (prohibited by Gerrit) How should I fix this? -Shreyansh http://lists.freedesktop.org/mailman/listinfo/libreoffice You are not allowed to push to master. Instead you need to use something like git push origin HEAD:refs/for/master which will push it to the review queue. Regards, Markus -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Error while pushing commits for bug 93240
http://pastebin.com/zWu0ZedZ On Fri, Aug 28, 2015 at 8:24 PM Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey, On Fri, Aug 28, 2015 at 4:52 PM, Ashod Nakashian ashnak...@gmail.com wrote: On Fri, Aug 28, 2015 at 8:15 AM, Shreyansh Gandhi gandhish...@gmail.com wrote: Same result:- git push origin HEAD:refs/for/master Try replacing HEAD with the branch name. No. Please read the error message. ( [remote rejected] HEAD - refs/for/master (you are not allowed to upload merges)) You have somewhere a merge commit. Can you pastebin the first lines of git log? Regards, Markus Counting objects: 63, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - refs/for/master (you are not allowed to upload merges) error: failed to push some refs to 'ssh://logerrit/core' On Fri, Aug 28, 2015 at 5:41 PM Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey, On Fri, Aug 28, 2015 at 2:10 PM, Shreyansh Gandhi gandhish...@gmail.com wrote: Hi, So, the problem was that an original initial commit (with no actual changes) was being inherited from master. Now when I try to push my changes, git push origin HEAD:master Counting objects: 56, done. Delta compression using up to 4 threads. Compressing objects: 100% (12/12), done. Writing objects: 100% (13/13), 1.44 KiB | 0 bytes/s, done. Total 13 (delta 9), reused 0 (delta 0) remote: Resolving deltas: 100% (9/9) remote: Branch refs/heads/master: remote: You are not allowed to perform this operation. remote: To push into this reference you need 'Push' rights. remote: User: phenom remote: Please read the documentation and contact an administrator remote: if you feel the configuration is incorrect remote: Processing changes: refs: 1, done To ssh://logerrit/core ! [remote rejected] HEAD - master (prohibited by Gerrit) How should I fix this? -Shreyansh http://lists.freedesktop.org/mailman/listinfo/libreoffice You are not allowed to push to master. Instead you need to use something like git push origin HEAD:refs/for/master which will push it to the review queue. Regards, Markus -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Regards, Shreyansh Gandhi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
