From: "Nipunn Koorapati via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Nipunn Koorapati <nipunn1313@gmail.com>,
Alex Vandiver <alexmv@dropbox.com>
Subject: [PATCH] dir.c: fix comments to agree with argument name
Date: Thu, 15 Oct 2020 12:49:20 +0000 [thread overview]
Message-ID: <pull.757.git.1602766160815.gitgitgadget@gmail.com> (raw)
From: Alex Vandiver <alexmv@dropbox.com>
Signed-off-by: Alex Vandiver <alexmv@dropbox.com>
Signed-off-by: Nipunn Koorapati <nipunn@dropbox.com>
---
dir.c: Fix comments to agree with argument name
Comments are out of date with the variable names.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-757%2Fnipunn1313%2Fcomments-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-757/nipunn1313/comments-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/757
dir.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dir.c b/dir.c
index 78387110e6..4c79c4f0e1 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 SHA-1 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]) &&
base-commit: d4a392452e292ff924e79ec8458611c0f679d6d4
--
gitgitgadget
next reply other threads:[~2020-10-15 12:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 12:49 Nipunn Koorapati via GitGitGadget [this message]
2020-10-15 16:07 ` [PATCH] dir.c: fix comments to agree with argument name Jeff King
2020-10-15 18:41 ` Junio C Hamano
2020-10-15 19:33 ` Nipunn Koorapati
2020-10-15 19:41 ` Jeff King
2020-10-15 20:23 ` Junio C Hamano
2020-10-16 12:39 ` Nipunn Koorapati
2020-10-15 16:28 ` [PATCH v2] " Nipunn Koorapati via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.757.git.1602766160815.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=alexmv@dropbox.com \
--cc=git@vger.kernel.org \
--cc=nipunn1313@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).