summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-11-02 21:17:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-11-02 21:17:42 (GMT)
commit03cd25ecbdaea419c7d07163c8930a658a4f44d2 (patch)
tree95a31dd2931d5613b5f5a83867e49fff23543a32
parent5277bd3e26991233199348c62c5bb7ff010f2e34 (diff)
parente5cf6d3df4020748719312dcfde1412c6ff968a5 (diff)
downloadgit-03cd25ecbdaea419c7d07163c8930a658a4f44d2.zip
git-03cd25ecbdaea419c7d07163c8930a658a4f44d2.tar.gz
git-03cd25ecbdaea419c7d07163c8930a658a4f44d2.tar.bz2
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
-rw-r--r--dir.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dir.c b/dir.c
index 7838711..ebea5f1 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]) &&