X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=dir.c;h=ebea5f1f91439a097e48ffb5983fbff2bc0ff918;hb=4c7eb63d2d4ad6d88a336357baaa6a934b604eda;hp=78387110e609e16d769b4c42bcba1d1effb731e0;hpb=c7ac8c0a7ccba76f082b9fd9c7e35b66209d8bf3;p=thirdparty%2Fgit.git diff --git a/dir.c b/dir.c index 78387110e6..ebea5f1f91 100644 --- a/dir.c +++ b/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]) &&