Re: [PATCH 21/30] tree-walk.h API users: use "tmp" for mode in shift_tree_by()
From: Elijah Newren <hidden>
Date: 2021-03-09 17:48:56
On Mon, Mar 8, 2021 at 7:07 AM Ævar Arnfjörð Bjarmason [off-list ref] wrote: Since there's only one API user, shouldn't the subject be "match-trees: use tmp..." instead of "tree-walk.h API users: use tmp..." ?
quoted hunk ↗ jump to hunk
Refactor code added in 85e51b783c3 (Make "subtree" part more orthogonal to the rest of merge-recursive., 2008-06-30) to make it obvious that we don't care about the "mode" here outside of the if statement it appears in. That's opposed to the sub1 & sub2 variables, where we use the two object ids later in this function. Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- match-trees.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)diff --git a/match-trees.c b/match-trees.c index ba4aabf39d1..4f02768c01e 100644 --- a/match-trees.c +++ b/match-trees.c@@ -317,17 +317,17 @@ void shift_tree_by(struct repository *r, const char *shift_prefix) { struct object_id sub1, sub2; - unsigned short mode1, mode2; + unsigned short tmp; unsigned candidate = 0; /* Can hash2 be a tree at shift_prefix in tree hash1? */ - if (!get_tree_entry_mode(r, hash1, shift_prefix, &sub1, &mode1) && - S_ISDIR(mode1)) + if (!get_tree_entry_mode(r, hash1, shift_prefix, &sub1, &tmp) && + S_ISDIR(tmp)) candidate |= 1; /* Can hash1 be a tree at shift_prefix in tree hash2? */ - if (!get_tree_entry_mode(r, hash2, shift_prefix, &sub2, &mode2) && - S_ISDIR(mode2)) + if (!get_tree_entry_mode(r, hash2, shift_prefix, &sub2, &tmp) && + S_ISDIR(tmp)) candidate |= 2; if (candidate == 3) { --2.31.0.rc0.126.g04f22c5b82