Over Christmas with the help of Howard and Visvanath I got Moodle 2.7 on a laptop running Ubuntu 13. Just now I did git pull as I have often done before - it ran through everything making me think it would be fine and then it said "aborting" When I looked in Notifications in Site admin it was still Moodle from 24 Dec and so hadn't updated. How do I troubleshoot this please? Thanks
What *exactly* did you type and what *exactly* was the message?
Also, do these (inside the Moodle folder)...
git remote -v
git branch -vv
Output from both please
OK this is what I first get (and I have not made any "local changes" because I don't know how to) Then a load of "stuff" and the Aborting message.Another screenshot coming imminently with your other requests...
And (second screenshot)
As I like to say - it tells you
You have made changes to the files so it's (not unreasonably) refusing to overwrite your changes. If you want to know what you changed, type...
What happens next depends on if you intended to make those changes (or want to keep them)
Going to take a guess at what might have happened. Try typing in the following command and then try again...
git config --global core.filemode false
Typing git diff I got a lot of stuff like this (not all in the screenshot as it would have been too big) And typing git config --global core.filemode false and trying again I still got abort. OK so I have obviously been fiddling with something but I haven't a clue what or when
Yep - see my edit/afterthought above.
Git sees a permission change as a change to the file. For use like this it can safely be ignored and that config line will 'fix' it.
The more change thing *should* work. Try it without the --global. As Tim says, you can just do 'git checkout' and it will reset the permissions (and the other permissions should work fine)
Alternatively, if git diff shows that there are no changes you care about, you can get rid of the changes by doing
git checkout .
(Note the . there. It is important.)
git reset --hard
would probably also work.
Thanks all git checkout with the space and the full stop (goodness me, yes!) fixed it - another one for my little notebook
As long as you appreciate that you put it back to how it was immediately after the files where checked out of git. In this case, it's probably what you wanted but not a step to be taken lightly
I still don't know what I am supposed to have changed that I wasn't aware I changed though, but never mind.
The diff tells you *exactly*. That's actually another cool thing about Git (well, kinda the point really). You can't change something and then say "I don't remember what I did". The 'git diff' tells you. In this case a change of permissions on all the files.
Well if I did it then it must have been because you told me to
Just like my wife......
All's well with the world, then
I see that Howard could already shed some light on this. Better follow that line.
I must admit that such an unflattering language in the part of Git is mean. That lies perhaps in its origin: search for "Linus on git" on YouTube.
P.S. I don't want to post the link to the video, it appears as a huge picture on moodle.org.