Merge branch 'maint-1.8.5' into maint-1.9

* maint-1.8.5:
annotate: use argv_array
t7300: repair filesystem permissions with test_when_finished
enums: remove trailing ',' after last item in enum

diff --cc builtin/clean.c
Simple merge

diff --cc pretty.c
Simple merge

diff --cc t/t7300-clean.sh
Simple merge