git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] pseudo-merge.h: fix a typo

From
Taylor Blau <me@ttaylorr.com>
Date
Mar 18, 2025, 22:54 UTC
Message-ID
<3b3cc5c0fa2d0696eb15c5d3c97a6c93a0d39252.1742338479.git.me@ttaylorr.com>

The comment added in 7252d9a036 (pseudo-merge: implement support for finding existing merges, 2024-05-23) misspells 'bitmap' as 'bitamp'.

Correct that so that we no longer have any stray "bitamps" lurking throughout the tree:

    $ git grep -ci bitamp | wc -l
    0
Noticed-by: Jeff King <peff@peff.net>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
 pseudo-merge.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pseudo-merge.h b/pseudo-merge.h
index c9fbe9d312..cf0e62ecd1 100644
--- a/pseudo-merge.h
+++ b/pseudo-merge.h
@@ -210,7 +210,7 @@ int cascade_pseudo_merges(const struct pseudo_merge_map *pm,
 
 /*
  * Returns a pseudo-merge which contains the exact set of commits
- * listed in the "parents" bitamp, or NULL if none could be found.
+ * listed in the "parents" bitmap, or NULL if none could be found.
  */
 struct pseudo_merge *pseudo_merge_for_parents(const struct pseudo_merge_map *pm,
 					      struct bitmap *parents);

base-commit: 683c54c999c301c2cd6f715c411407c413b1d84e
-- 
2.49.0.1.g3b3cc5c0fa
Next: Elijah Newren
Message 1 of 2 in “pseudo-merge.h: fix a typo”
  1. pseudo-merge.h: fix a typoTaylor Blau, Mar 18, 2025
  2. Elijah NewrenMar 19, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.