Skip to content

Commit 84a7c33

Browse files
3geek14gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fb7d80e commit 84a7c33

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

branch.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ static int submodule_create_branch(struct repository *r,
729729
}
730730

731731
void create_branches_recursively(struct repository *r, const char *name,
732-
const char *start_commitish,
732+
const char *start_committish,
733733
const char *tracking_name, int force,
734734
int reflog, int quiet, enum branch_track track,
735735
int dry_run)
@@ -739,8 +739,8 @@ void create_branches_recursively(struct repository *r, const char *name,
739739
struct object_id super_oid;
740740
struct submodule_entry_list submodule_entry_list;
741741

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,
744744
&branch_point, &super_oid);
745745

746746
/*
@@ -763,7 +763,7 @@ void create_branches_recursively(struct repository *r, const char *name,
763763
submodule_entry_list.entries[i].submodule->name);
764764
if (advice_enabled(ADVICE_SUBMODULES_NOT_UPDATED))
765765
advise(_("You may try updating the submodules using 'git checkout --no-recurse-submodules %s && git submodule update --init'"),
766-
start_commitish);
766+
start_committish);
767767
exit(code);
768768
}
769769

@@ -778,7 +778,7 @@ void create_branches_recursively(struct repository *r, const char *name,
778778
name);
779779
}
780780

781-
create_branch(r, name, start_commitish, force, 0, reflog, quiet,
781+
create_branch(r, name, start_committish, force, 0, reflog, quiet,
782782
BRANCH_TRACK_NEVER, dry_run);
783783
if (dry_run)
784784
return;

branch.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,26 +78,26 @@ void create_branch(struct repository *r,
7878
* those of create_branch() except for start_name, which is represented
7979
* by two different parameters:
8080
*
81-
* - start_commitish is the commit-ish, in repository r, that determines
81+
* - start_committish is the commit-ish, in repository r, that determines
8282
* 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
8585
* tree.
8686
*
8787
* - tracking_name is the name of the ref, in repository r, that will be
8888
* used to set up tracking information. This value is propagated to
8989
* 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.
9191
*
92-
* When this function is called on the superproject, start_commitish
92+
* When this function is called on the superproject, start_committish
9393
* can be any user-provided ref and tracking_name can be NULL (similar
9494
* 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
9696
* be used for tracking information, tracking_name is propagated and
9797
* used for tracking instead.
9898
*/
9999
void create_branches_recursively(struct repository *r, const char *name,
100-
const char *start_commitish,
100+
const char *start_committish,
101101
const char *tracking_name, int force,
102102
int reflog, int quiet, enum branch_track track,
103103
int dry_run);

po/tr.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# clone | klon(lamak) #
2121
# commit (ad) | işleme #
2222
# commit (eyl.) | işlemek #
23-
# commitish | işlememsi #
23+
# commit-ish | işlememsi #
2424
# conflict | çakışma #
2525
# cruft | süprüntü #
2626
# dangling object | sallanan nesne #

0 commit comments

Comments
 (0)