From b031f47802b60114d294c2075f8607ce30f50920 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Sun, 19 Sep 2021 01:48:54 +0000 Subject: trace2.h: fix trivial comment typo Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- trace2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trace2.h b/trace2.h index ede18c2e06..49c96ec26b 100644 --- a/trace2.h +++ b/trace2.h @@ -340,7 +340,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, ...); -- cgit v1.2.3 From 3584cff71c62586c050505b80d7d4c9b1b290101 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Sun, 19 Sep 2021 01:48:55 +0000 Subject: merge-ort: fix completely wrong comment 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 Signed-off-by: Junio C Hamano --- merge-ort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-ort.c b/merge-ort.c index 6eb910d6f0..b346e23ff2 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -4065,7 +4065,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; -- cgit v1.2.3