Miscellaneous fixups preparing for the removal of merge-recursive #1882
Conversation
stash was modified to use merge_ort_nonrecursive() instead of merge_recursive_generic() back in commit 874cf2a (stash: apply stash using 'merge_ort_nonrecursive()', 2022-05-10). That makes the inclusion of merge-recursive.h unnecessary. In preparation for the removal of merge-recursive.h, remove the unnecessary include. Signed-off-by: Elijah Newren <[email protected]>
The comment describing testcase 13b of t6423 somehow mixed up commits A and B in one paragraph. Fix the references. Signed-off-by: Elijah Newren <[email protected]>
t7615 is entirely about testing the differences about different diff algorithms, but it doesn't specify any diff algorithm when it is testing myers. Given that we have discussed potentially switching defaults (https://lore.kernel.org/git/[email protected]/), it makes sense in tests that are about different diff algorithms to be explicitly about which one is intended to be used in each test. Add that specificity. Signed-off-by: Elijah Newren <[email protected]>
Both strset_for_each_entry and strintmap_for_each_entry are macros that evaluate to the same thing, so they are technically interchangeable. However, the intent is that we use the one matching the variable type we are passing. Unfortunately, I somehow mistakenly got one of these wrong in 7bee6c1 (merge-ort: avoid recursing into directories when we don't need to, 2021-07-16) -- possibly related to the fact that relevant_sources was initially a strset and later refactored into a strintmap. Correct which macro we use. Signed-off-by: Elijah Newren <[email protected]>
"is was" -> "was" Signed-off-by: Elijah Newren <[email protected]>
|
/submit |
|
Submitted as [email protected] To fetch this version into To fetch this version to local tag |
|
This patch series was integrated into seen via git@d1e05b7. |
|
This branch is now known as |
|
This patch series was integrated into seen via git@4ce2f37. |
|
This patch series was integrated into next via git@87acd24. |
|
This patch series was integrated into seen via git@d9c9a7c. |
|
There was a status update in the "New Topics" section about the branch Miscellaneous code clean-ups. Will merge to 'master'. source: <[email protected]> |
|
This patch series was integrated into seen via git@9ce3f33. |
|
There was a status update in the "Cooking" section about the branch Miscellaneous code clean-ups. Will merge to 'master'. source: <[email protected]> |
|
This patch series was integrated into seen via git@cd54acb. |
|
This patch series was integrated into seen via git@aba8484. |
|
There was a status update in the "Cooking" section about the branch Miscellaneous code clean-ups. Will merge to 'master'. source: <[email protected]> |
|
This patch series was integrated into seen via git@ee45956. |
|
This patch series was integrated into seen via git@ff926a6. |
|
This patch series was integrated into master via git@ff926a6. |
|
This patch series was integrated into next via git@ff926a6. |
|
Closed via ff926a6. |
2 participants
While working on the removal of merge recursive, there were a handful of miscellaneous fixups, none of which changed any behavior. Each is a very small localized change. This does not depend on any other PRs, and in fact each commit in this series is orthogonal. I'm just grouping them because they are all tiny, miscellaneous fixups.