Re: [Libreoffice] Git pull problems

2011-12-19 Thread Michael Meeks
On Sun, 2011-12-18 at 15:30 +0100, Alexander Thurgood wrote: Thanks for your suggestion, but I tried with and without the trailing circumflex to no avail. I just re-cloned in the end, which sorted things out. Gosh - I'm sorry about that. I'd have been curious to see the results of

Re: [Libreoffice] Git pull problems

2011-12-18 Thread Alexander Thurgood
Le 16/12/11 17:34, Korrawit Pruegsanusak a écrit : Hi Korrawit, Not sure if this is too late, but IMHO you've missed a trailing ^ in git reset. :-) Thanks for your suggestion, but I tried with and without the trailing circumflex to no avail. I just re-cloned in the end, which sorted things

Re: [Libreoffice] Git pull problems

2011-12-16 Thread Korrawit Pruegsanusak
Hello Alex, all, On Wed, Dec 14, 2011 at 17:38, Alex Thurgood alex.thurg...@gmail.com wrote: Le 14/12/2011 11:18, Bjoern Michaelsen a écrit :  git reset --hard 28b86ca7b704d2789cad69f7516203434202c082^  git pull [cut] Unfortunately not : git reset --hard

Re: [Libreoffice] Git pull problems

2011-12-14 Thread Michael Meeks
Hi Alex, On Wed, 2011-12-14 at 10:19 +0100, Alex Thurgood wrote: Not being very conversant with git, I'm seeing the following problem on my Linux box and don't know how to sort it out : Ah - fun :-) git pull ./g pull error: Unable to find c29667cde3f151a73d7302757a6eca316b886aa3

Re: [Libreoffice] Git pull problems

2011-12-14 Thread Alex Thurgood
Le 14/12/2011 10:47, Michael Meeks a écrit : Hi Michael, So - this could happen in quite a few ways; most probably if you committed something locally, then used git format-patch -1 to send it off - and then someone else tweaked your patch before applying. I tend to use ./g

Re: [Libreoffice] Git pull problems

2011-12-14 Thread Alex Thurgood
Le 14/12/2011 10:47, Michael Meeks a écrit : git tag -f here # backup tag in case we loose something git reset --hard HEAD~50 git pull -r That winds back 50 commits and then re-pulls; of course if you have any commits of your own, you'll now need to do 'gitk

Re: [Libreoffice] Git pull problems

2011-12-14 Thread Bjoern Michaelsen
On Wed, Dec 14, 2011 at 10:19:58AM +0100, Alex Thurgood wrote: git pull ./g pull error: Unable to find c29667cde3f151a73d7302757a6eca316b886aa3 under http://anongit.freedesktop.org/git/libreoffice/core.git Cannot obtain needed tree c29667cde3f151a73d7302757a6eca316b886aa3 while processing

Re: [Libreoffice] Git pull problems

2011-12-14 Thread Alex Thurgood
Le 14/12/2011 11:18, Bjoern Michaelsen a écrit : Hi Bjoern, The tree object c29667cde3f151a73d7302757a6eca316b886aa3 exists here, but not the commit 28b86ca7b704d2789cad69f7516203434202c082. If that commit isnt too old (git show 28b86ca7b704d2789cad69f7516203434202c082 should tell you): git