Merge branch 'rs/janitorial' into maint

Code clean-up.

* rs/janitorial:
dir: remove unused variable sb
clean: remove unused variable buf
use file_exists() to check if a file exists in the worktree

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/clean.c
Simple merge

diff --cc dir.c
Simple merge