From: Junio C Hamano Date: Wed, 6 May 2009 05:51:31 +0000 (-0700) Subject: Merge branch 'maint-1.6.0' into maint X-Git-Tag: v1.6.3~9^2~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=41f64ad34b10697ceac68e3a3ad9df3baca9be34;p=git.git Merge branch 'maint-1.6.0' into maint * maint-1.6.0: dir.c: Fix two minor grammatical errors in comments --- 41f64ad34b10697ceac68e3a3ad9df3baca9be34 diff --cc dir.c index 2245749b3,4e6b988d3..8b6c1f475 --- 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