From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Jun 2015 19:45:15 +0000 (-0700)
Subject: Merge branch 'rs/janitorial'
X-Git-Tag: v2.5.0-rc0~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ba5bb5531c6ec64a57ae2754ba51ce477eebaf0;p=thirdparty%2Fgit.git

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
---

4ba5bb5531c6ec64a57ae2754ba51ce477eebaf0
diff --cc builtin/blame.c
index 662339fe63,91d4221f59..b3e948e757
--- a/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,