Skip to content

Commit

Permalink
typo: Replace 'commitish' with 'committish'
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
Pi Fisher authored and gitster committed Apr 10, 2024
1 parent fb7d80e commit deeb7ba
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions branch.c
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ static int submodule_create_branch(struct repository *r,
}

void create_branches_recursively(struct repository *r, const char *name,
const char *start_commitish,
const char *start_committish,
const char *tracking_name, int force,
int reflog, int quiet, enum branch_track track,
int dry_run)
Expand All @@ -739,8 +739,8 @@ void create_branches_recursively(struct repository *r, const char *name,
struct object_id super_oid;
struct submodule_entry_list submodule_entry_list;

/* Perform dwim on start_commitish to get super_oid and branch_point. */
dwim_branch_start(r, start_commitish, BRANCH_TRACK_NEVER,
/* Perform dwim on start_committish to get super_oid and branch_point. */
dwim_branch_start(r, start_committish, BRANCH_TRACK_NEVER,
&branch_point, &super_oid);

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

Expand All @@ -778,7 +778,7 @@ void create_branches_recursively(struct repository *r, const char *name,
name);
}

create_branch(r, name, start_commitish, force, 0, reflog, quiet,
create_branch(r, name, start_committish, force, 0, reflog, quiet,
BRANCH_TRACK_NEVER, dry_run);
if (dry_run)
return;
Expand Down
14 changes: 7 additions & 7 deletions branch.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,26 +78,26 @@ void create_branch(struct repository *r,
* those of create_branch() except for start_name, which is represented
* by two different parameters:
*
* - start_commitish is the commit-ish, in repository r, that determines
* - start_committish is the commit-ish, in repository r, that determines
* which commits the branches will point to. The superproject branch
* will point to the commit of start_commitish and the submodule
* branches will point to the gitlink commit oids in start_commitish's
* will point to the commit of start_committish and the submodule
* branches will point to the gitlink commit oids in start_committish's
* tree.
*
* - tracking_name is the name of the ref, in repository r, that will be
* used to set up tracking information. This value is propagated to
* all submodules, which will evaluate the ref using their own ref
* stores. If NULL, this defaults to start_commitish.
* stores. If NULL, this defaults to start_committish.
*
* When this function is called on the superproject, start_commitish
* When this function is called on the superproject, start_committish
* can be any user-provided ref and tracking_name can be NULL (similar
* to create_branches()). But when recursing through submodules,
* start_commitish is the plain gitlink commit oid. Since the oid cannot
* start_committish is the plain gitlink commit oid. Since the oid cannot
* be used for tracking information, tracking_name is propagated and
* used for tracking instead.
*/
void create_branches_recursively(struct repository *r, const char *name,
const char *start_commitish,
const char *start_committish,
const char *tracking_name, int force,
int reflog, int quiet, enum branch_track track,
int dry_run);
Expand Down
2 changes: 1 addition & 1 deletion po/tr.po
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# clone | klon(lamak) #
# commit (ad) | işleme #
# commit (eyl.) | işlemek #
# commitish | işlememsi #
# commit-ish | işlememsi #
# conflict | çakışma #
# cruft | süprüntü #
# dangling object | sallanan nesne #
Expand Down

0 comments on commit deeb7ba

Please sign in to comment.