{"thread":{"id":"13308","subject":"git push: failed to push some refs and missing commit","startedAt":"2008-04-28T17:10:20Z","lastAt":"2008-04-28T17:56:10Z","messageCount":2,"participants":["Nico Schottelius"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"75408","messageId":"20080428171020.GF23412@denkbrett.schottelius.org","threadId":"13308","inReplyTo":null,"subject":"git push: failed to push some refs and missing commit","fromName":"Nico Schottelius","fromEmail":"nico-git-20080428@schottelius.org","sentAt":"2008-04-28T17:10:20Z","receivedAt":"2008-04-28T17:10:20Z","isPatch":false,"sender":{"key":"nico-git-20080428@schottelius.org","avatar":null},"body":"Hello!\n\nError 1:\n\nWhen doing git-push once I get:\n\nchdebfl0@u0160:~/public_html/nello$ git-push\nCounting objects: 43, done.\nCompressing objects: 100% (19/19), done.\nWriting objects: 100% (24/24), 6.94 KiB, done.\nTotal 24 (delta 17), reused 3 (delta 2)\nUnpacking objects: 100% (24/24), done.\nTo /home/server/git/web/nello/.git\n   9299071..06c9c06  master -> master\nerror: failed to push some refs to '/home/server/git/web/nello/.git'\nchdebfl0@u0160:~/public_html/nello$ git-status\n# On branch master\nnothing to commit (working directory clean)\n\nDoing git-fetch does not fetch, as there is nothing new, git-push\nsucceeds the second time:\n\nchdebfl0@u0160:~/public_html/nello$ git-fetch\nchdebfl0@u0160:~/public_html/nello$ git-push\nEverything up-to-date\nchdebfl0@u0160:~/public_html/nello$ \n\nError 2:\n\nI miss a commit, that removed the function hideContent();\n\nIf I do\n\n% git-log -p -ShideContent\n\nI see two commits:\n\n- the first one, that introduced the function\n- the second one that I used to git checkout <firstcommit> filename it again\n\nIt seems some other files have been modified without having an log entry.\n\nAnyone an idea, what could be the reason for it?\n\nSincerly\n\nNico\n\nPS: Please CC me, I am not subscribed.\n\n-- \nThink about Free and Open Source Software (FOSS).\nhttp://nico.schottelius.org/documentations/foss/the-term-foss/\n\nPGP: BFE4 C736 ABE5 406F 8F42  F7CF B8BE F92A 9885 188C\n"},{"id":"75415","messageId":"20080428175610.GB10794@denkbrett.schottelius.org","threadId":"13308","inReplyTo":"20080428171020.GF23412@denkbrett.schottelius.org","subject":"Re: git push: failed to push some refs and missing commit","fromName":"Nico Schottelius","fromEmail":"nico-git-20080428@schottelius.org","sentAt":"2008-04-28T17:56:10Z","receivedAt":"2008-04-28T17:56:10Z","isPatch":false,"sender":{"key":"nico-git-20080428@schottelius.org","avatar":null},"body":"Nico Schottelius [Mon, Apr 28, 2008 at 07:10:20PM +0200]:\n> Error 2:\n> \n> I miss a commit, that removed the function hideContent();\n> [...]\n\nI found out that one of our webdevs used git push -f, which may be\na good reason for that.\n\nCould error 1 also be caused by that?\n\nNico\n\n\n-- \nThink about Free and Open Source Software (FOSS).\nhttp://nico.schottelius.org/documentations/foss/the-term-foss/\n\nPGP: BFE4 C736 ABE5 406F 8F42  F7CF B8BE F92A 9885 188C\n"}]}