From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 9 May 2009 04:12:41 +0000 (-0700)
Subject: Merge branch 'maint-1.6.0' into maint-1.6.1
X-Git-Tag: v1.6.3.1~1^2~1^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f29d669a91b2c8f1c68c1f4fb10f03456a997fa8;p=git.git

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  dir.c: Fix two minor grammatical errors in comments
---

f29d669a91b2c8f1c68c1f4fb10f03456a997fa8
diff --cc dir.c
index 2c18e417d,4e6b988d3..53ad921a0
--- a/dir.c
+++ b/dir.c
@@@ -52,8 -52,13 +52,8 @@@ int common_prefix(const char **pathspec
  	return prefix;
  }
  
 -static inline int special_char(unsigned char c1)
 -{
 -	return !c1 || c1 == '*' || c1 == '[' || c1 == '?' || c1 == '\\';
 -}
 -
  /*
-  * Does 'match' matches the given name?
+  * Does 'match' match the given name?
   * A match is found if
   *
   * (1) the 'match' string is leading directory of 'name', or