"stg pop --keep" fails because of git-apply --index (bug #8972)