summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorShawn Bohrer <shawn.bohrer@gmail.com>2008-04-15 03:14:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-15 06:14:58 (GMT)
commitf2d0df7148a1b9ee69bd69a365ffcd1965872451 (patch)
tree744c03640836faf926e71766b030faab7942203f /dir.c
parentf669ac0be901e19a8948c9b04af63d23ebae8003 (diff)
downloadgit-f2d0df7148a1b9ee69bd69a365ffcd1965872451.zip
git-f2d0df7148a1b9ee69bd69a365ffcd1965872451.tar.gz
git-f2d0df7148a1b9ee69bd69a365ffcd1965872451.tar.bz2
git clean: Don't automatically remove directories when run within subdirectory
When git clean is run from a subdirectory it should follow the normal policy and only remove directories if they are passed in as a pathspec, or -d is specified. The fix is to send len which could be shorter than ent->len because we have stripped the trailing '/' that read_directory adds. Additionaly match_one() was modified to allow a name[] that is not NUL terminated. This allows us to check if the name matched the pathspec exactly instead of recursively. Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dir.c b/dir.c
index edc458e..d79762c 100644
--- a/dir.c
+++ b/dir.c
@@ -80,7 +80,7 @@ static int match_one(const char *match, const char *name, int namelen)
if (strncmp(match, name, matchlen))
return !fnmatch(match, name, 0) ? MATCHED_FNMATCH : 0;
- if (!name[matchlen])
+ if (namelen == matchlen)
return MATCHED_EXACTLY;
if (match[matchlen-1] == '/' || name[matchlen] == '/')
return MATCHED_RECURSIVELY;