]> git.ipfire.org Git - thirdparty/git.git/commitdiff
dir.c: fix comments to agree with argument name
authorAlex Vandiver <alexmv@dropbox.com>
Thu, 15 Oct 2020 16:28:36 +0000 (16:28 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2020 15:40:27 +0000 (08:40 -0700)
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>
dir.c

diff --git a/dir.c b/dir.c
index 1045cc9c6f58702aba6e9036a8bce91a431c108a..42078609824cb6b3843f74bef38154e61980035a 100644 (file)
--- 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]) &&