kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'pf/commitish-committish' 

Spellfix.

* pf/commitish-committish:
  typo: replace 'commitish' with 'committish'
maint
Junio C Hamano 2024-04-19 09:13:47 -07:00
parent 21306a098c 84a7c33a4b
commit 18dd9301a2
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
branch.c
View File

@ -738,7 +738,7 @@ static int submodule_create_branch(struct repository *r,
} }


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


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


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


@ -787,7 +787,7 @@ void create_branches_recursively(struct repository *r, const char *name,
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); BRANCH_TRACK_NEVER, dry_run);
if (dry_run) if (dry_run)
return; return;

14
branch.h
View File

@ -78,26 +78,26 @@ void create_branch(struct repository *r,
* those of create_branch() except for start_name, which is represented * those of create_branch() except for start_name, which is represented
* by two different parameters: * 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 * which commits the branches will point to. The superproject branch
* will point to the commit of start_commitish and the submodule * will point to the commit of start_committish and the submodule
* branches will point to the gitlink commit oids in start_commitish's * branches will point to the gitlink commit oids in start_committish's
* tree. * tree.
* *
* - tracking_name is the name of the ref, in repository r, that will be * - 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 * used to set up tracking information. This value is propagated to
* all submodules, which will evaluate the ref using their own ref * 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 * can be any user-provided ref and tracking_name can be NULL (similar
* to create_branches()). But when recursing through submodules, * 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 * be used for tracking information, tracking_name is propagated and
* used for tracking instead. * used for tracking instead.
*/ */
void create_branches_recursively(struct repository *r, const char *name, void create_branches_recursively(struct repository *r, const char *name,
const char *start_commitish, const char *start_committish,
const char *tracking_name, int force, const char *tracking_name, int force,
int reflog, int quiet, enum branch_track track, int reflog, int quiet, enum branch_track track,
int dry_run); int dry_run);

2
po/tr.po
View File

@ -20,7 +20,7 @@
# clone | klon(lamak) # # clone | klon(lamak) #
# commit (ad) | işleme # # commit (ad) | işleme #
# commit (eyl.) | işlemek # # commit (eyl.) | işlemek #
# commitish | işlememsi # # commit-ish | işlememsi #
# conflict | çakışma # # conflict | çakışma #
# cruft | süprüntü # # cruft | süprüntü #
# dangling object | sallanan nesne # # dangling object | sallanan nesne #