Updated safe-local-variable-directories patch onto master and added bug
number to commit message.

Also should I use git --reroll-count to make v2 patches, v3, etc?  If so
then I included another patch to gitignore rerolled patches, otherwise
please disregard it.