On 9 August 2015 at 19:08, Eli Schwartz
I have just attempted to update fanficfare{,-git} and I cannot push the changes because they are a non-fast-forward.
I cannot be 100% sure because I don't have local clones, I have been splitting off subtrees as needed (see my setup at https://github.com/eli-schwartz/pkgbuilds) but this is supposed to be 100% guaranteed to create the same sha1 hash. However, it appears that the AUR repos are now out of sync. Same content and everything.
Am I supposed to believe that those packages -- and a bunch more (but not all...) of mine -- had their repos randomly and sneakily rewritten??? Or that git subtrees are simply unreliable??? Neither seems very likely.
This was working perfectly at least until July 20 (the last time I updated anything).
-- Eli Schwartz
I know it makes no sense why it should, but maybe your commit 84953afaf0255b746b3f591cf869d530f31b3a09 made it confused? Whenever something goes wrong for me with git I always try out a fresh clone to mess around with so you might want to see if that works as well. I unfortunately did notice that clones don't retain their subtree infrastructure though, so that's kind of disappointing (I had to merge your commit manually). Thanks for fanficfare though, didn't know that existed. Sincerely, Joost Bremmer "We apologize for the inconvenience"