What a complete faff that was updating #Friendcia via git.

git config --global --add safe.directory /var/www/html/friendica/

Don't forget you'll need to tell git about /addons too.

git --"I don't give a toss who owns the directory. just git pull ffs!"