{"thread":{"id":"63159","subject":"[PATCH] pseudo-merge.h: fix a typo","startedAt":"2025-03-18T22:54:47Z","lastAt":"2025-03-19T14:21:28Z","messageCount":2,"participants":["Taylor Blau","Elijah Newren"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"514574","messageId":"3b3cc5c0fa2d0696eb15c5d3c97a6c93a0d39252.1742338479.git.me@ttaylorr.com","threadId":"63159","inReplyTo":null,"subject":"[PATCH] pseudo-merge.h: fix a typo","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2025-03-18T22:54:44Z","receivedAt":"2025-03-18T22:54:47Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"The comment added in 7252d9a036 (pseudo-merge: implement support for\nfinding existing merges, 2024-05-23) misspells 'bitmap' as 'bitamp'.\n\nCorrect that so that we no longer have any stray \"bitamps\" lurking\nthroughout the tree:\n\n    $ git grep -ci bitamp | wc -l\n    0\n\nNoticed-by: Jeff King <peff@peff.net>\nSigned-off-by: Taylor Blau <me@ttaylorr.com>\n---\n pseudo-merge.h | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/pseudo-merge.h b/pseudo-merge.h\nindex c9fbe9d312..cf0e62ecd1 100644\n--- a/pseudo-merge.h\n+++ b/pseudo-merge.h\n@@ -210,7 +210,7 @@ int cascade_pseudo_merges(const struct pseudo_merge_map *pm,\n \n /*\n  * Returns a pseudo-merge which contains the exact set of commits\n- * listed in the \"parents\" bitamp, or NULL if none could be found.\n+ * listed in the \"parents\" bitmap, or NULL if none could be found.\n  */\n struct pseudo_merge *pseudo_merge_for_parents(const struct pseudo_merge_map *pm,\n \t\t\t\t\t      struct bitmap *parents);\n\nbase-commit: 683c54c999c301c2cd6f715c411407c413b1d84e\n-- \n2.49.0.1.g3b3cc5c0fa\n"},{"id":"514645","messageId":"CABPp-BET=AGEm_K71ZdY=E_KGXT904B67688MOakxg4yRxeQRw@mail.gmail.com","threadId":"63159","inReplyTo":"3b3cc5c0fa2d0696eb15c5d3c97a6c93a0d39252.1742338479.git.me@ttaylorr.com","subject":"Re: [PATCH] pseudo-merge.h: fix a typo","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2025-03-19T14:21:17Z","receivedAt":"2025-03-19T14:21:28Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Tue, Mar 18, 2025 at 3:56 PM Taylor Blau <me@ttaylorr.com> wrote:\n>\n> The comment added in 7252d9a036 (pseudo-merge: implement support for\n> finding existing merges, 2024-05-23) misspells 'bitmap' as 'bitamp'.\n>\n> Correct that so that we no longer have any stray \"bitamps\" lurking\n> throughout the tree:\n\nThose poor bitamps; not being shown any love.\n\n>     $ git grep -ci bitamp | wc -l\n>     0\n>\n> Noticed-by: Jeff King <peff@peff.net>\n> Signed-off-by: Taylor Blau <me@ttaylorr.com>\n> ---\n>  pseudo-merge.h | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/pseudo-merge.h b/pseudo-merge.h\n> index c9fbe9d312..cf0e62ecd1 100644\n> --- a/pseudo-merge.h\n> +++ b/pseudo-merge.h\n> @@ -210,7 +210,7 @@ int cascade_pseudo_merges(const struct pseudo_merge_map *pm,\n>\n>  /*\n>   * Returns a pseudo-merge which contains the exact set of commits\n> - * listed in the \"parents\" bitamp, or NULL if none could be found.\n> + * listed in the \"parents\" bitmap, or NULL if none could be found.\n>   */\n>  struct pseudo_merge *pseudo_merge_for_parents(const struct pseudo_merge_map *pm,\n>                                               struct bitmap *parents);\n>\n> base-commit: 683c54c999c301c2cd6f715c411407c413b1d84e\n> --\n> 2.49.0.1.g3b3cc5c0fa\n\nSimple clean-up; looks good.\n"}]}