Merge branch 'rs/janitorial'

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
index 662339fe63eafe8b554d5189480f37557df4c5cb,91d4221f5949a94077cad5e528e547d988fd6135..b3e948e757e97947211f598488339cd4f03c43eb
--- 1/builtin/blame.c
--- 2/builtin/blame.c
+++ b/builtin/blame.c
@@@ -26,8 -26,9 +26,9 @@@
  #include "userdiff.h"
  #include "line-range.h"
  #include "line-log.h"
+ #include "dir.h"
  
 -static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] file");
 +static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
  
  static const char *blame_opt_usage[] = {
        blame_usage,

diff --cc builtin/clean.c
Simple merge

diff --cc dir.c
Simple merge

diff --cc submodule.c
Simple merge