[SOLVED] [git] When I do 'git pull' I get an error message

Slarioux
Slarioux's picture

Joined: 2009-08-08
Posts: 56
Posted: Wed, 2009-11-25 08:09

This is not at all a gallery 3 issue, but I ran into it and I can't seem to find the answer. I Googled, but people seem to have it on other repositories as well, but none of them post a fix.

Anyway, like I was saying in some other thread, I'm running gallery3 straight of git. "Because I can", basically. I have the following problem since this morning:

Quote:
sander@einstein:$ git pull
From git://github.com/gallery/gallery3
! [rejected] bharat_dev -> bharat_dev (non fast forward)
sander@einstein:$

You can guess what my question is, I think. ;-)

If there is no solution, or you know of one, it will be easy to switch my gallery over to a new directory and symlink the /var/. I do it already. But I was hoping you'd know a solution :).
 
floridave
floridave's picture

Joined: 2003-12-22
Posts: 25961
Posted: Wed, 2009-11-25 13:42

I just did a git pull and did not see that but did see:

Quote:
remote: Counting objects: 260, done.
remote: Compressing objects: 100% (70/70), done.
remote: Total 163 (delta 97), reused 151 (delta 87)
Receiving objects: 100% (163/163), 110.77 KiB, done.
Resolving deltas: 100% (97/97), completed with 73 local objects.
From git://github.com/gallery/gallery3
+ 8e202e7...e201536 bharat_dev -> origin/bharat_dev (forced update)
38233c6..82ee5f9 master -> origin/master
Updating 38233c6..82ee5f9
Fast forward
modules/gallery/controllers/simple_uploader.php | 6 ++--
modules/gallery/tests/xss_data.txt | 24 +++++++++++-----------
2 files changed, 15 insertions(+), 15 deletions(-)

perhaps you can do:
git reset --hard HEAD && git pull

Dave
_____________________________________________
Blog & G2 || floridave - Gallery Team
 
Slarioux
Slarioux's picture

Joined: 2009-08-08
Posts: 56
Posted: Wed, 2009-11-25 14:07

It didn't work.

sander@einstein:$ git reset --hard HEAD && git pull
HEAD is now at 38233c6 Merge branch 'master' of :gallery/gallery3
From git://github.com/gallery/gallery3
 ! [rejected]        bharat_dev -> bharat_dev  (non fast forward)

And then:

sander@einstein:$ git pull
From git://github.com/gallery/gallery3
 ! [rejected]        bharat_dev -> bharat_dev  (non fast forward)

But no worries. I'm pretty sure it's local. I'll switch to a new dir. Should go without a hitch :).
 
Slarioux
Slarioux's picture

Joined: 2009-08-08
Posts: 56
Posted: Wed, 2009-11-25 14:07

And I just did. 

sander@einstein:/var/www/facetube$ mv www-current www-old
sander@einstein:/var/www/facetube$ mv www-next www-current

sander@einstein:$ cd ~
sander@einstein:$ ./facetube.sh
Already up-to-date.
Already up-to-date.

I must admit I found the "hard pull" trick at the wiki as well. I just was afraid it might break things. Thanks for your help!