typo: replace 'commitish' with 'committish'
Across only three files, comments and a single function name used 'commitish' rather than 'commit-ish' or 'committish' as the spelling. The git glossary accepts a hyphen or a double-t, but not a single-t. Despite the typo in a translation file, none of the typos appear in user-visible locations. Signed-off-by: Pi Fisher <Pi.L.D.Fisher@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pi Fisher committed
Apr 7, 2024 at 17:21 UTC
84a7c33a4b2260076664185daeba601ff1f09dc4
3 files changed
+13
-13
branch.c
+5
-5
@@ -729,7 +729,7 @@ static int submodule_create_branch(struct repository *r,
729
}
730
731
void create_branches_recursively(struct repository *r, const char *name,
732
- const char *start_commitish,
732
+ const char *start_committish,
733
const char *tracking_name, int force,
734
int reflog, int quiet, enum branch_track track,
735
int dry_run)
@@ -739,8 +739,8 @@ void create_branches_recursively(struct repository *r, const char *name,
739
struct object_id super_oid;
740
struct submodule_entry_list submodule_entry_list;
741
742
- /* Perform dwim on start_commitish to get super_oid and branch_point. */
743
- dwim_branch_start(r, start_commitish, BRANCH_TRACK_NEVER,
742
+ /* Perform dwim on start_committish to get super_oid and branch_point. */
743
+ dwim_branch_start(r, start_committish, BRANCH_TRACK_NEVER,
744
&branch_point, &super_oid);
745
746
/*
@@ -763,7 +763,7 @@ void create_branches_recursively(struct repository *r, const char *name,
763
submodule_entry_list.entries[i].submodule->name);
764
if (advice_enabled(ADVICE_SUBMODULES_NOT_UPDATED))
765
advise(_("You may try updating the submodules using 'git checkout --no-recurse-submodules %s && git submodule update --init'"),
766
- start_commitish);
766
+ start_committish);
767
exit(code);
768
}
769
@@ -778,7 +778,7 @@ void create_branches_recursively(struct repository *r, const char *name,
778
name);
779
}
780
781
- create_branch(r, name, start_commitish, force, 0, reflog, quiet,
781
+ create_branch(r, name, start_committish, force, 0, reflog, quiet,
782
BRANCH_TRACK_NEVER, dry_run);
783
if (dry_run)
784
return;
branch.h
+7
-7
@@ -78,26 +78,26 @@ void create_branch(struct repository *r,
78
* those of create_branch() except for start_name, which is represented
79
* by two different parameters:
80
*
81
- * - start_commitish is the commit-ish, in repository r, that determines
81
+ * - start_committish is the commit-ish, in repository r, that determines
82
* which commits the branches will point to. The superproject branch
83
- * will point to the commit of start_commitish and the submodule
84
- * branches will point to the gitlink commit oids in start_commitish's
83
+ * will point to the commit of start_committish and the submodule
84
+ * branches will point to the gitlink commit oids in start_committish's
85
* tree.
86
*
87
* - tracking_name is the name of the ref, in repository r, that will be
88
* used to set up tracking information. This value is propagated to
89
* all submodules, which will evaluate the ref using their own ref
90
- * stores. If NULL, this defaults to start_commitish.
90
+ * stores. If NULL, this defaults to start_committish.
91
*
92
- * When this function is called on the superproject, start_commitish
92
+ * When this function is called on the superproject, start_committish
93
* can be any user-provided ref and tracking_name can be NULL (similar
94
* to create_branches()). But when recursing through submodules,
95
- * start_commitish is the plain gitlink commit oid. Since the oid cannot
95
+ * start_committish is the plain gitlink commit oid. Since the oid cannot
96
* be used for tracking information, tracking_name is propagated and
97
* used for tracking instead.
98
*/
99
void create_branches_recursively(struct repository *r, const char *name,
100
- const char *start_commitish,
100
+ const char *start_committish,
101
const char *tracking_name, int force,
102
int reflog, int quiet, enum branch_track track,
103
int dry_run);
po/tr.po
+1
-1
@@ -20,7 +20,7 @@
20
# clone | klon(lamak) #
21
# commit (ad) | işleme #
22
# commit (eyl.) | işlemek #
23
-# commitish | işlememsi #
23
+# commit-ish | işlememsi #
24
# conflict | çakışma #
25
# cruft | süprüntü #
26
# dangling object | sallanan nesne #