summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-06 05:51:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-06 05:51:31 (GMT)
commit41f64ad34b10697ceac68e3a3ad9df3baca9be34 (patch)
treea8c67b74ffdbabf73ef01b3dabcac828d9f47969 /dir.c
parente88d022af96312e64216bfec31bd6749277c335a (diff)
parent2c5b0115038ab283b346fbb8059b93973ff4c8f2 (diff)
downloadgit-41f64ad34b10697ceac68e3a3ad9df3baca9be34.zip
git-41f64ad34b10697ceac68e3a3ad9df3baca9be34.tar.gz
git-41f64ad34b10697ceac68e3a3ad9df3baca9be34.tar.bz2
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: dir.c: Fix two minor grammatical errors in comments
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dir.c b/dir.c
index 2245749..8b6c1f4 100644
--- a/dir.c
+++ b/dir.c
@@ -53,7 +53,7 @@ int common_prefix(const char **pathspec)
}
/*
- * 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
@@ -290,7 +290,7 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen)
dir->basebuf[baselen] = '\0';
}
-/* Scan the list and let the last match determines the fate.
+/* Scan the list and let the last match determine the fate.
* Return 1 for exclude, 0 for include and -1 for undecided.
*/
static int excluded_1(const char *pathname,