mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-10 22:46:21 +02:00
Code

Merge branch 'maint-1.6.0' into maint-1.6.1 

* maint-1.6.0:
  dir.c: Fix two minor grammatical errors in comments
This commit is contained in:
Junio C Hamano 2009-05-08 21:12:41 -07:00
parent bab39ed371 2c5b011503
commit f29d669a91
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dir.c
View File

@ -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,