[PATCH 4/7] diffcore-rename: change a few comments to use 'add' instead of 'create'
- From
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Dec 6, 2020, 02:54 UTC
- Message-ID
- <77ca4656ed442321b41e653505c85d0be31b8045.1607223276.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.929.git.git.1607223276.gitgitgadget@gmail.com>
From: Elijah Newren <newren@gmail.com>
As with the last commit, it feels odd to talk about "creation" (which to me implies a brand new file, i.e. one not associated with an existing file, and thus one that could not have been a rename) when we are using the files to look for renames. Use the term "addition" instead.
Signed-off-by: Elijah Newren <newren@gmail.com> --- diffcore-rename.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/diffcore-rename.c b/diffcore-rename.c index 655a67759c8..7270eb6af48 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -173,7 +173,7 @@ static int estimate_similarity(struct repository *r, { /* src points at a file that existed in the original tree (or * optionally a file in the destination tree) and dst points - * at a newly created file. They may be quite similar, in which + * at a newly added file. They may be quite similar, in which * case we want to say src is renamed to dst or src is copied into * dst, and then some edit has been applied to dst. * @@ -652,9 +652,9 @@ void diffcore_rename(struct diff_options *options) } else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) { /* - * Creation + * Addition * - * We would output this create record if it has + * We would output this add record if it has * not been turned into a rename/copy already. */ struct diff_rename_dst *dst = locate_rename_dst(p->two); @@ -664,7 +664,7 @@ void diffcore_rename(struct diff_options *options) } else /* no matching rename/copy source, so - * record this as a creation. + * record this as an addition. */ diff_q(&outq, p); }
-- gitgitgadget