Improve git-status performance for v1.8.5

Followup to #94