{"thread":{"id":"22287","subject":"Push to origin failed","startedAt":"2010-01-19T14:41:19Z","lastAt":"2010-01-19T15:05:40Z","messageCount":2,"participants":["Johannes Schneider","Sverre Rabbelier"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"132106","messageId":"4B55C48F.2090005@cedarsoft.com","threadId":"22287","inReplyTo":null,"subject":"Push to origin failed","fromName":"Johannes Schneider","fromEmail":"mailings@cedarsoft.com","sentAt":"2010-01-19T14:41:19Z","receivedAt":"2010-01-19T14:41:19Z","isPatch":false,"sender":{"key":"mailings@cedarsoft.com","avatar":null},"body":"Hi,\n\nmy Hudson isn't able to push master back to origin under some special \ncircumstances:\n\nThe git-push command failed.\nCommand output:\nTo ssh://git.cedarsoft.com/git/com.cedarsoft.open\n  ! [rejected]        master -> master (non-fast forward)\nerror: failed to push some refs to \n'ssh://git.cedarsoft.com/git/com.cedarsoft.open'\n\n\nWhen I delete the .git directory and let Hudson do the same thing again, \neverything works well.\nOf course I have verified the obvious first:\n\n\ngit push\nTo ssh://git.cedarsoft.com/git/com.cedarsoft.open\n  ! [rejected]        master -> master (non-fast forward)\nerror: failed to push some refs to \n'ssh://git.cedarsoft.com/git/com.cedarsoft.open'\n\ngit log\ncommit 1e3d3d2c1a38cae75d60bbcd8bc739ed00597ad3\nAuthor: Hudson <hudson@cedarsoft.com>\nDate:   Tue Jan 19 15:25:10 2010 +0100\n\n     [maven-release-plugin] prepare release open-2.0.6\n\ncommit 9b8b395a4f9f725aa82be61474835fd1f7d009a7\nAuthor: Johannes Schneider <js@cedarsoft.com>\nDate:   Tue Jan 19 12:00:14 2010 +0100\n\n     license-plugin: added excludes\n\n\n\nOn my local computer, I have called \"git pull\" on master and then tried \ngit log with that result:\n\n\ngit log\ncommit 9b8b395a4f9f725aa82be61474835fd1f7d009a7\nAuthor: Johannes Schneider <js@cedarsoft.com>\nDate:   Tue Jan 19 12:00:14 2010 +0100\n\n     license-plugin: added excludes\n\n\n\nSo I don't see any reason why the push failed. Any ideas? How can I \ninvestigate this issue further?\nObviously I don't know enough about Git, so any hints are welcome...\n\n\nThanks,\n\nJohannes\n"},{"id":"132108","messageId":"fabb9a1e1001190705o5698e675med65ec8618befa8e@mail.gmail.com","threadId":"22287","inReplyTo":"4B55C48F.2090005@cedarsoft.com","subject":"Re: Push to origin failed","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2010-01-19T15:05:40Z","receivedAt":"2010-01-19T15:05:40Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Tue, Jan 19, 2010 at 15:41, Johannes Schneider\n<mailings@cedarsoft.com> wrote:\n>  ! [rejected]        master -> master (non-fast forward)\n\nThere's your problem. You could solve it by instead doing 'git push\n-f' (telling it to push even though it's not a fast-forward), but that\nwould make it hard for those downstream of that repository. So, read\nup on 'fast-forwards' and why it's bad to push if it's not a\nfast-forward, but mainly figure out why you have a fast-forward in the\nfirst place. It could very well be that you need to fetch and merge\n(or fetch and rebase) first.\n\n-- \nCheers,\n\nSverre Rabbelier\n"}]}