Merge branch 'maint-1.6.0' into maint-1.6.1

gitster · gitster · commit f29d669a91b2 · 2009-05-08T21:12:41.000-07:00
* maint-1.6.0:
  dir.c: Fix two minor grammatical errors in comments
diff --git 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
@@ -287,7 +287,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,

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ int common_prefix(const char **pathspec)`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/*`
`56`		`- * Does 'match' matches the given name?`
	`56`	`+ * Does 'match' match the given name?`
`57`	`57`	`* A match is found if`
`58`	`58`	`*`
`59`	`59`	`* (1) the 'match' string is leading directory of 'name', or`
`@@ -287,7 +287,7 @@ static void prep_exclude(struct dir_struct dir, const char base, int baselen)`
`287`	`287`	`dir->basebuf[baselen] = '\0';`
`288`	`288`	`}`
`289`	`289`
`290`		`-/* Scan the list and let the last match determines the fate.`
	`290`	`+/* Scan the list and let the last match determine the fate.`
`291`	`291`	`* Return 1 for exclude, 0 for include and -1 for undecided.`
`292`	`292`	`*/`
`293`	`293`	`static int excluded_1(const char *pathname,`