mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'nk/dir-c-comment-update'
Update stale in-code comment. * nk/dir-c-comment-update: dir.c: fix comments to agree with argument name
This commit is contained in:
commit
03cd25ecbd
6
dir.c
6
dir.c
|
@ -1040,9 +1040,9 @@ static int add_patterns_from_buffer(char *buf, size_t size,
|
|||
* an index if 'istate' is non-null), parse it and store the
|
||||
* exclude rules in "pl".
|
||||
*
|
||||
* If "ss" is not NULL, compute SHA-1 of the exclude file and fill
|
||||
* If "oid_stat" is not NULL, compute oid of the exclude file and fill
|
||||
* stat data from disk (only valid if add_patterns returns zero). If
|
||||
* ss_valid is non-zero, "ss" must contain good value as input.
|
||||
* oid_stat.valid is non-zero, "oid_stat" must contain good value as input.
|
||||
*/
|
||||
static int add_patterns(const char *fname, const char *base, int baselen,
|
||||
struct pattern_list *pl, struct index_state *istate,
|
||||
|
@ -1090,7 +1090,7 @@ static int add_patterns(const char *fname, const char *base, int baselen,
|
|||
int pos;
|
||||
if (oid_stat->valid &&
|
||||
!match_stat_data_racy(istate, &oid_stat->stat, &st))
|
||||
; /* no content change, ss->sha1 still good */
|
||||
; /* no content change, oid_stat->oid still good */
|
||||
else if (istate &&
|
||||
(pos = index_name_pos(istate, fname, strlen(fname))) >= 0 &&
|
||||
!ce_stage(istate->cache[pos]) &&
|
||||
|
|
Loading…
Reference in a new issue