{"thread":{"id":"56535","subject":"[PATCH 0/2] Fix a few comments","startedAt":"2021-09-19T01:49:01Z","lastAt":"2021-09-19T01:49:12Z","messageCount":3,"participants":["Elijah Newren via GitGitGadget"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"436336","messageId":"pull.1093.git.git.1632016135.gitgitgadget@gmail.com","threadId":"56535","inReplyTo":null,"subject":"[PATCH 0/2] Fix a few comments","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-09-19T01:48:53Z","receivedAt":"2021-09-19T01:49:01Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"Here's a couple trivial comment fixes sitting in random branches that I'm\nfinally sending upstream.\n\nElijah Newren (2):\n  trace2.h: fix trivial comment typo\n  merge-ort: fix completely wrong comment\n\n merge-ort.c | 2 +-\n trace2.h    | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\n\nbase-commit: 4c719308ce59dc70e606f910f40801f2c6051b24\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1093%2Fnewren%2Ffix-comments-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1093/newren/fix-comments-v1\nPull-Request: https://github.com/git/git/pull/1093\n-- \ngitgitgadget\n"},{"id":"436337","messageId":"eeebf73185fa54722fc7722eb6ca0e04df95ae69.1632016135.git.gitgitgadget@gmail.com","threadId":"56535","inReplyTo":"pull.1093.git.git.1632016135.gitgitgadget@gmail.com","subject":"[PATCH 1/2] trace2.h: fix trivial comment typo","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-09-19T01:48:54Z","receivedAt":"2021-09-19T01:49:12Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren <newren@gmail.com>\n\nSigned-off-by: Elijah Newren <newren@gmail.com>\n---\n trace2.h | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/trace2.h b/trace2.h\nindex 9b7286c572f..2f450ab5bed 100644\n--- a/trace2.h\n+++ b/trace2.h\n@@ -350,7 +350,7 @@ void trace2_def_repo_fl(const char *file, int line, struct repository *repo);\n  * being started, such as \"read_recursive\" or \"do_read_index\".\n  *\n  * The `repo` field, if set, will be used to get the \"repo-id\", so that\n- * recursive oerations can be attributed to the correct repository.\n+ * recursive operations can be attributed to the correct repository.\n  */\n void trace2_region_enter_fl(const char *file, int line, const char *category,\n \t\t\t    const char *label, const struct repository *repo, ...);\n-- \ngitgitgadget\n\n"},{"id":"436338","messageId":"5dd56d0c5366eaac1d235ce374358ad0f072c617.1632016135.git.gitgitgadget@gmail.com","threadId":"56535","inReplyTo":"pull.1093.git.git.1632016135.gitgitgadget@gmail.com","subject":"[PATCH 2/2] merge-ort: fix completely wrong comment","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-09-19T01:48:55Z","receivedAt":"2021-09-19T01:49:12Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren <newren@gmail.com>\n\nNot sure what happened, but the comment is describing code elsewhere in\nthe file.  Fix the comment to actually discuss the code that follows.\n\nSigned-off-by: Elijah Newren <newren@gmail.com>\n---\n merge-ort.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/merge-ort.c b/merge-ort.c\nindex 515dc39b7f6..841196cf728 100644\n--- a/merge-ort.c\n+++ b/merge-ort.c\n@@ -4081,7 +4081,7 @@ static int record_conflicted_index_entries(struct merge_options *opt)\n \tstate.istate = index;\n \toriginal_cache_nr = index->cache_nr;\n \n-\t/* Put every entry from paths into plist, then sort */\n+\t/* Append every entry from conflicted into index, then sort */\n \tstrmap_for_each_entry(&opt->priv->conflicted, &iter, e) {\n \t\tconst char *path = e->key;\n \t\tstruct conflict_info *ci = e->value;\n-- \ngitgitgadget\n"}]}