# [PATCH 0/2] Fix a few comments 3 messages from 2021-09-19 to 2021-09-19. Participants: Elijah Newren via GitGitGadget. Thread: https://gitlist.dev/t/56535 ## Elijah Newren via GitGitGadget, 2021-09-19 01:48 Subject: [PATCH 0/2] Fix a few comments Message-ID: URL: https://gitlist.dev/e/pull.1093.git.git.1632016135.gitgitgadget%40gmail.com ``` Here's a couple trivial comment fixes sitting in random branches that I'm finally sending upstream. Elijah Newren (2): trace2.h: fix trivial comment typo merge-ort: fix completely wrong comment merge-ort.c | 2 +- trace2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) base-commit: 4c719308ce59dc70e606f910f40801f2c6051b24 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1093%2Fnewren%2Ffix-comments-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1093/newren/fix-comments-v1 Pull-Request: https://github.com/git/git/pull/1093 -- gitgitgadget ``` ## Elijah Newren via GitGitGadget, 2021-09-19 01:48 Subject: [PATCH 1/2] trace2.h: fix trivial comment typo Message-ID: URL: https://gitlist.dev/e/eeebf73185fa54722fc7722eb6ca0e04df95ae69.1632016135.git.gitgitgadget%40gmail.com In-Reply-To: ``` From: Elijah Newren Signed-off-by: Elijah Newren --- trace2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trace2.h b/trace2.h index 9b7286c572f..2f450ab5bed 100644 --- a/trace2.h +++ b/trace2.h @@ -350,7 +350,7 @@ void trace2_def_repo_fl(const char *file, int line, struct repository *repo); * being started, such as "read_recursive" or "do_read_index". * * The `repo` field, if set, will be used to get the "repo-id", so that - * recursive oerations can be attributed to the correct repository. + * recursive operations can be attributed to the correct repository. */ void trace2_region_enter_fl(const char *file, int line, const char *category, const char *label, const struct repository *repo, ...); -- gitgitgadget ``` ## Elijah Newren via GitGitGadget, 2021-09-19 01:48 Subject: [PATCH 2/2] merge-ort: fix completely wrong comment Message-ID: <5dd56d0c5366eaac1d235ce374358ad0f072c617.1632016135.git.gitgitgadget@gmail.com> URL: https://gitlist.dev/e/5dd56d0c5366eaac1d235ce374358ad0f072c617.1632016135.git.gitgitgadget%40gmail.com In-Reply-To: ``` From: Elijah Newren Not sure what happened, but the comment is describing code elsewhere in the file. Fix the comment to actually discuss the code that follows. Signed-off-by: Elijah Newren --- merge-ort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-ort.c b/merge-ort.c index 515dc39b7f6..841196cf728 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -4081,7 +4081,7 @@ static int record_conflicted_index_entries(struct merge_options *opt) state.istate = index; original_cache_nr = index->cache_nr; - /* Put every entry from paths into plist, then sort */ + /* Append every entry from conflicted into index, then sort */ strmap_for_each_entry(&opt->priv->conflicted, &iter, e) { const char *path = e->key; struct conflict_info *ci = e->value; -- gitgitgadget ```