summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-06 05:52:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-06 05:52:17 (GMT)
commit8146f19762c8fd67f6df3da4ba87a4e5ea880909 (patch)
tree4c870d39697d7155ef2d2e2c3c87afc76de77e6c /dir.c
parentae616de6d53ef14ba11d2aa32f366086c1435dfa (diff)
parent54e0e6edfa60f84b582112804365e207e70f44a6 (diff)
downloadgit-8146f19762c8fd67f6df3da4ba87a4e5ea880909.zip
git-8146f19762c8fd67f6df3da4ba87a4e5ea880909.tar.gz
git-8146f19762c8fd67f6df3da4ba87a4e5ea880909.tar.bz2
Merge branch 'maint'
* maint: improve error message in config.c t4018-diff-funcname: add cpp xfuncname pattern to syntax test Work around BSD whose typeof(tv.tv_sec) != time_t git-am.txt: reword extra headers in message body git-am.txt: Use date or value instead of time or timestamp git-am.txt: add an 'a', say what 'it' is, simplify a sentence dir.c: Fix two minor grammatical errors in comments git-svn: fix a sloppy Getopt::Long usage
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 15677da..6aae09a 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,