Skip to content

Commit 03cd25e

Browse files
committed
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
2 parents 5277bd3 + e5cf6d3 commit 03cd25e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

dir.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,9 +1040,9 @@ static int add_patterns_from_buffer(char *buf, size_t size,
10401040
* an index if 'istate' is non-null), parse it and store the
10411041
* exclude rules in "pl".
10421042
*
1043-
* If "ss" is not NULL, compute SHA-1 of the exclude file and fill
1043+
* If "oid_stat" is not NULL, compute oid of the exclude file and fill
10441044
* stat data from disk (only valid if add_patterns returns zero). If
1045-
* ss_valid is non-zero, "ss" must contain good value as input.
1045+
* oid_stat.valid is non-zero, "oid_stat" must contain good value as input.
10461046
*/
10471047
static int add_patterns(const char *fname, const char *base, int baselen,
10481048
struct pattern_list *pl, struct index_state *istate,
@@ -1090,7 +1090,7 @@ static int add_patterns(const char *fname, const char *base, int baselen,
10901090
int pos;
10911091
if (oid_stat->valid &&
10921092
!match_stat_data_racy(istate, &oid_stat->stat, &st))
1093-
; /* no content change, ss->sha1 still good */
1093+
; /* no content change, oid_stat->oid still good */
10941094
else if (istate &&
10951095
(pos = index_name_pos(istate, fname, strlen(fname))) >= 0 &&
10961096
!ce_stage(istate->cache[pos]) &&

0 commit comments

Comments
 (0)