summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Alex Vandiver <alexmv@dropbox.com>2020-10-15 16:28:36 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-10-16 08:40:27 -0700
commite5cf6d3df4020748719312dcfde1412c6ff968a5 (patch)
tree9e3a4ea92f428555ad5f0e674e224ebce482262a
parentGit 2.28 (diff)
downloadtgif-e5cf6d3df4020748719312dcfde1412c6ff968a5.tar.xz
dir.c: fix comments to agree with argument name
Signed-off-by: Alex Vandiver <alexmv@dropbox.com> Signed-off-by: Nipunn Koorapati <nipunn@dropbox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--dir.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dir.c b/dir.c
index 1045cc9c6f..4207860982 100644
--- a/dir.c
+++ b/dir.c
@@ -1033,9 +1033,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,
@@ -1083,7 +1083,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]) &&