{"thread":{"id":"61292","subject":"[PATCH] typo: Replace 'commitish' with 'committish'","startedAt":"2024-04-07T21:21:19Z","lastAt":"2024-04-10T21:15:41Z","messageCount":2,"participants":["Pi Fisher","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"492478","messageId":"20240407212111.55362-1-Pi.L.D.Fisher@gmail.com","threadId":"61292","inReplyTo":null,"subject":"[PATCH] typo: Replace 'commitish' with 'committish'","fromName":"Pi Fisher","fromEmail":"pi.l.d.fisher@gmail.com","sentAt":"2024-04-07T21:21:08Z","receivedAt":"2024-04-07T21:21:19Z","isPatch":true,"sender":{"key":"pi.l.d.fisher@gmail.com","avatar":null},"body":"Across only three files, comments and a single function name used\n'commitish' rather than 'commit-ish' or 'committish' as the spelling.\nThe git glossary accepts a hyphen or a double-t, but not a single-t.\nDespite the typo in a translation file, none of the typos appear in\nuser-visible locations.\n\nSigned-off-by: Pi Fisher <Pi.L.D.Fisher@gmail.com>\n---\nThe function name was renamed to use 'committish', preferring to avoid a\nhyphenated word. Comments referencing this function were rewritten to\nmatch the new name. In the translation file, 'commit-ish' appeared\nmultiple times, but 'committish' appeared only once, so I changed the\ncomment to match the more popular option.\n\n branch.c | 10 +++++-----\n branch.h | 14 +++++++-------\n po/tr.po |  2 +-\n 3 files changed, 13 insertions(+), 13 deletions(-)\n\ndiff --git a/branch.c b/branch.c\nindex 6719a181bd..b8f8fd4979 100644\n--- a/branch.c\n+++ b/branch.c\n@@ -734,7 +734,7 @@ static int submodule_create_branch(struct repository *r,\n }\n \n void create_branches_recursively(struct repository *r, const char *name,\n-\t\t\t\t const char *start_commitish,\n+\t\t\t\t const char *start_committish,\n \t\t\t\t const char *tracking_name, int force,\n \t\t\t\t int reflog, int quiet, enum branch_track track,\n \t\t\t\t int dry_run)\n@@ -744,8 +744,8 @@ void create_branches_recursively(struct repository *r, const char *name,\n \tstruct object_id super_oid;\n \tstruct submodule_entry_list submodule_entry_list;\n \n-\t/* Perform dwim on start_commitish to get super_oid and branch_point. */\n-\tdwim_branch_start(r, start_commitish, BRANCH_TRACK_NEVER,\n+\t/* Perform dwim on start_committish to get super_oid and branch_point. */\n+\tdwim_branch_start(r, start_committish, BRANCH_TRACK_NEVER,\n \t\t\t  &branch_point, &super_oid);\n \n \t/*\n@@ -768,7 +768,7 @@ void create_branches_recursively(struct repository *r, const char *name,\n \t\t\t\tsubmodule_entry_list.entries[i].submodule->name);\n \t\t\tif (advice_enabled(ADVICE_SUBMODULES_NOT_UPDATED))\n \t\t\t\tadvise(_(\"You may try updating the submodules using 'git checkout --no-recurse-submodules %s && git submodule update --init'\"),\n-\t\t\t\t       start_commitish);\n+\t\t\t\t       start_committish);\n \t\t\texit(code);\n \t\t}\n \n@@ -783,7 +783,7 @@ void create_branches_recursively(struct repository *r, const char *name,\n \t\t\t    name);\n \t}\n \n-\tcreate_branch(r, name, start_commitish, force, 0, reflog, quiet,\n+\tcreate_branch(r, name, start_committish, force, 0, reflog, quiet,\n \t\t      BRANCH_TRACK_NEVER, dry_run);\n \tif (dry_run)\n \t\treturn;\ndiff --git a/branch.h b/branch.h\nindex 30c01aed73..ec2f35fda4 100644\n--- a/branch.h\n+++ b/branch.h\n@@ -78,26 +78,26 @@ void create_branch(struct repository *r,\n  * those of create_branch() except for start_name, which is represented\n  * by two different parameters:\n  *\n- * - start_commitish is the commit-ish, in repository r, that determines\n+ * - start_committish is the commit-ish, in repository r, that determines\n  *   which commits the branches will point to. The superproject branch\n- *   will point to the commit of start_commitish and the submodule\n- *   branches will point to the gitlink commit oids in start_commitish's\n+ *   will point to the commit of start_committish and the submodule\n+ *   branches will point to the gitlink commit oids in start_committish's\n  *   tree.\n  *\n  * - tracking_name is the name of the ref, in repository r, that will be\n  *   used to set up tracking information. This value is propagated to\n  *   all submodules, which will evaluate the ref using their own ref\n- *   stores. If NULL, this defaults to start_commitish.\n+ *   stores. If NULL, this defaults to start_committish.\n  *\n- * When this function is called on the superproject, start_commitish\n+ * When this function is called on the superproject, start_committish\n  * can be any user-provided ref and tracking_name can be NULL (similar\n  * to create_branches()). But when recursing through submodules,\n- * start_commitish is the plain gitlink commit oid. Since the oid cannot\n+ * start_committish is the plain gitlink commit oid. Since the oid cannot\n  * be used for tracking information, tracking_name is propagated and\n  * used for tracking instead.\n  */\n void create_branches_recursively(struct repository *r, const char *name,\n-\t\t\t\t const char *start_commitish,\n+\t\t\t\t const char *start_committish,\n \t\t\t\t const char *tracking_name, int force,\n \t\t\t\t int reflog, int quiet, enum branch_track track,\n \t\t\t\t int dry_run);\ndiff --git a/po/tr.po b/po/tr.po\nindex 19d6661bbe..5837752d0b 100644\n--- a/po/tr.po\n+++ b/po/tr.po\n@@ -20,7 +20,7 @@\n # clone                       | klon(lamak)                 #\n # commit (ad)                 | işleme                      #\n # commit (eyl.)               | işlemek                     #\n-# commitish                   | işlememsi                   #\n+# commit-ish                  | işlememsi                   #\n # conflict                    | çakışma                     #\n # cruft                       | süprüntü                    #\n # dangling object             | sallanan nesne              #\n\nbase-commit: 3c2a3fdc388747b9eaf4a4a4f2035c1c9ddb26d0\n-- \n2.34.1\n\n"},{"id":"492746","messageId":"xmqqcyqwsyv9.fsf@gitster.g","threadId":"61292","inReplyTo":"20240407212111.55362-1-Pi.L.D.Fisher@gmail.com","subject":"Re: [PATCH] typo: Replace 'commitish' with 'committish'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-04-10T21:15:38Z","receivedAt":"2024-04-10T21:15:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Pi Fisher <pi.l.d.fisher@gmail.com> writes:\n\n> Across only three files, comments and a single function name used\n> 'commitish' rather than 'commit-ish' or 'committish' as the spelling.\n> The git glossary accepts a hyphen or a double-t, but not a single-t.\n> Despite the typo in a translation file, none of the typos appear in\n> user-visible locations.\n>\n> Signed-off-by: Pi Fisher <Pi.L.D.Fisher@gmail.com>\n> ---\n> The function name was renamed to use 'committish', preferring to avoid a\n> hyphenated word. Comments referencing this function were rewritten to\n> match the new name. In the translation file, 'commit-ish' appeared\n> multiple times, but 'committish' appeared only once, so I changed the\n> comment to match the more popular option.\n\nSounds good.  Thanks.\n"}]}