{"thread":{"id":"16836","subject":"push to backup repo periodically fails with \"not fast forward\"","startedAt":"2008-12-22T16:24:39Z","lastAt":"2008-12-22T18:27:32Z","messageCount":5,"participants":["davetron5000","Felipe Contreras","David Copeland","Nicolas Pitre"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"98548","messageId":"19016122-e19d-4885-8b0f-dec7b686c6ea@o4g2000pra.googlegroups.com","threadId":"16836","inReplyTo":null,"subject":"push to backup repo periodically fails with \"not fast forward\"","fromName":"davetron5000","fromEmail":"davetron5000@gmail.com","sentAt":"2008-12-22T16:24:39Z","receivedAt":"2008-12-22T16:24:39Z","isPatch":false,"sender":{"key":"davetron5000@gmail.com","avatar":"https://gravatar.com/avatar/9ec09086e36c4e609dfc23a4582d2c7adf7dc2fb1796f74492d52727efa6ba86?d=mp&s=160"},"body":"I have a repo on another disk that I ONLY use to backup my in-use\nlocal repo. I have a post-commit hook that does the push (git push --\nall remote-repo-name)\n\n>git commit -a -m 'some change'\nCounting objects: 71, done.\nCompressing objects: 100% (26/26), done.\nWriting objects: 100% (29/29), 2.31 KiB, done.\nTotal 29 (delta 12), reused 0 (delta 0)\nUnpacking objects: 100% (29/29), done.\nTo file:///Volumes/Git/pose/main\n 22d7f10..0037aaf bimonthly-frequency -> bimonthly-frequency\n ! [rejected] master -> master (non-fast forward)\nerror: failed to push some refs to 'file:///Volumes/Git/pose/main'\nCreated commit 0037aaf: Removed assertion that made no sense.\n 1 files changed, 0 insertions(+), 2 deletions(-)\n\nI'm using git as a front-end to Subversion, but I can't figure out why\nthis is happening.\n\nThe repo at /Volumes/Git/pose/main is NEVER pulled from or pushed to\nby anything other than my hook. I can't understand why any push to it\nwould NOT be a fast-forward.\n\nAny ideas how I can figure out what's going on?\n"},{"id":"98549","messageId":"94a0d4530812220911l37b825edj55178658f24755c1@mail.gmail.com","threadId":"16836","inReplyTo":"19016122-e19d-4885-8b0f-dec7b686c6ea@o4g2000pra.googlegroups.com","subject":"Re: push to backup repo periodically fails with \"not fast forward\"","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2008-12-22T17:11:00Z","receivedAt":"2008-12-22T17:11:00Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Mon, Dec 22, 2008 at 6:24 PM, davetron5000 wrote:\n> I have a repo on another disk that I ONLY use to backup my in-use\n> local repo. I have a post-commit hook that does the push (git push --\n> all remote-repo-name)\n>\n>>git commit -a -m 'some change'\n> Counting objects: 71, done.\n> Compressing objects: 100% (26/26), done.\n> Writing objects: 100% (29/29), 2.31 KiB, done.\n> Total 29 (delta 12), reused 0 (delta 0)\n> Unpacking objects: 100% (29/29), done.\n> To file:///Volumes/Git/pose/main\n> 22d7f10..0037aaf bimonthly-frequency -> bimonthly-frequency\n> ! [rejected] master -> master (non-fast forward)\n> error: failed to push some refs to 'file:///Volumes/Git/pose/main'\n> Created commit 0037aaf: Removed assertion that made no sense.\n> 1 files changed, 0 insertions(+), 2 deletions(-)\n>\n> I'm using git as a front-end to Subversion, but I can't figure out why\n> this is happening.\n>\n> The repo at /Volumes/Git/pose/main is NEVER pulled from or pushed to\n> by anything other than my hook. I can't understand why any push to it\n> would NOT be a fast-forward.\n>\n> Any ideas how I can figure out what's going on?\n\nDo you rebase your original repo?\n\n-- \nFelipe Contreras\n"},{"id":"98550","messageId":"f95d47890812220915h5286d2bdv7c8412ecf77be999@mail.gmail.com","threadId":"16836","inReplyTo":"94a0d4530812220911l37b825edj55178658f24755c1@mail.gmail.com","subject":"Re: push to backup repo periodically fails with \"not fast forward\"","fromName":"David Copeland","fromEmail":"davetron5000@gmail.com","sentAt":"2008-12-22T17:15:31Z","receivedAt":"2008-12-22T17:15:31Z","isPatch":false,"sender":{"key":"davetron5000@gmail.com","avatar":"https://gravatar.com/avatar/9ec09086e36c4e609dfc23a4582d2c7adf7dc2fb1796f74492d52727efa6ba86?d=mp&s=160"},"body":"the original gets rebased from a git svn rebase on occasion; so I\nguess that is causing things to not be fast-forward.\n\nI guess all I really want to do is keep a duplicate copy of my repo\nsomewhere else. Should I just use --force in my hook, or abandon git\nas the mechanism and use rsync?\n\nDave\n\nOn Mon, Dec 22, 2008 at 12:11 PM, Felipe Contreras\n wrote:\n> On Mon, Dec 22, 2008 at 6:24 PM, davetron5000 wrote:\n>> I have a repo on another disk that I ONLY use to backup my in-use\n>> local repo. I have a post-commit hook that does the push (git push --\n>> all remote-repo-name)\n>>\n>>>git commit -a -m 'some change'\n>> Counting objects: 71, done.\n>> Compressing objects: 100% (26/26), done.\n>> Writing objects: 100% (29/29), 2.31 KiB, done.\n>> Total 29 (delta 12), reused 0 (delta 0)\n>> Unpacking objects: 100% (29/29), done.\n>> To file:///Volumes/Git/pose/main\n>> 22d7f10..0037aaf bimonthly-frequency -> bimonthly-frequency\n>> ! [rejected] master -> master (non-fast forward)\n>> error: failed to push some refs to 'file:///Volumes/Git/pose/main'\n>> Created commit 0037aaf: Removed assertion that made no sense.\n>> 1 files changed, 0 insertions(+), 2 deletions(-)\n>>\n>> I'm using git as a front-end to Subversion, but I can't figure out why\n>> this is happening.\n>>\n>> The repo at /Volumes/Git/pose/main is NEVER pulled from or pushed to\n>> by anything other than my hook. I can't understand why any push to it\n>> would NOT be a fast-forward.\n>>\n>> Any ideas how I can figure out what's going on?\n>\n> Do you rebase your original repo?\n>\n> --\n> Felipe Contreras\n>\n"},{"id":"98551","messageId":"94a0d4530812220919t25233fa9ub461c86f10ec366d@mail.gmail.com","threadId":"16836","inReplyTo":"f95d47890812220915h5286d2bdv7c8412ecf77be999@mail.gmail.com","subject":"Re: push to backup repo periodically fails with \"not fast forward\"","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2008-12-22T17:19:26Z","receivedAt":"2008-12-22T17:19:26Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Mon, Dec 22, 2008 at 7:15 PM, David Copeland wrote:\n> the original gets rebased from a git svn rebase on occasion; so I\n> guess that is causing things to not be fast-forward.\n>\n> I guess all I really want to do is keep a duplicate copy of my repo\n> somewhere else. Should I just use --force in my hook, or abandon git\n> as the mechanism and use rsync?\n\nI would manually do 'git push backup' at certain points since not all\nmy commits are meant to be backed up, specially on temporal feature\nbranches.\n\nBut --force should do the trick.\n\n-- \nFelipe Contreras\n"},{"id":"98552","messageId":"alpine.LFD.2.00.0812221326490.30035@xanadu.home","threadId":"16836","inReplyTo":"f95d47890812220915h5286d2bdv7c8412ecf77be999@mail.gmail.com","subject":"Re: push to backup repo periodically fails with \"not fast forward\"","fromName":"Nicolas Pitre","fromEmail":"nico@cam.org","sentAt":"2008-12-22T18:27:32Z","receivedAt":"2008-12-22T18:27:32Z","isPatch":false,"sender":{"key":"nico@fluxnic.net","avatar":"https://avatars.githubusercontent.com/u/702790?v=4"},"body":"On Mon, 22 Dec 2008, David Copeland wrote:\n\n> the original gets rebased from a git svn rebase on occasion; so I\n> guess that is causing things to not be fast-forward.\n> \n> I guess all I really want to do is keep a duplicate copy of my repo\n> somewhere else. Should I just use --force in my hook, or abandon git\n> as the mechanism and use rsync?\n\nUsing --force is definitively better than rsync.\n\n\nNicolas\n"}]}