diff options
| -rw-r--r-- | branch.c | 2 | ||||
| -rw-r--r-- | branch.h | 9 | ||||
| -rw-r--r-- | builtin/branch.c | 2 | ||||
| -rw-r--r-- | builtin/checkout.c | 2 |
4 files changed, 8 insertions, 7 deletions
@@ -228,7 +228,7 @@ N_("\n" "\"git push -u\" to set the upstream config as you push."); void create_branch(const char *name, const char *start_name, - int force, int reflog, int clobber_head_ok, + int force, int clobber_head_ok, int reflog, int quiet, enum branch_track track) { struct commit *commit; @@ -13,19 +13,20 @@ * * - force enables overwriting an existing (non-head) branch * - * - reflog creates a reflog for the branch - * * - clobber_head_ok allows the currently checked out (hence existing) * branch to be overwritten; without 'force', it has no effect. * + * - reflog creates a reflog for the branch + * * - quiet suppresses tracking information * * - track causes the new branch to be configured to merge the remote branch * that start_name is a tracking branch for (if any). + * */ void create_branch(const char *name, const char *start_name, - int force, int reflog, - int clobber_head_ok, int quiet, enum branch_track track); + int force, int clobber_head_ok, + int reflog, int quiet, enum branch_track track); /* * Validates that the requested branch may be created, returning the diff --git a/builtin/branch.c b/builtin/branch.c index 33fd5fcfd1..4edef5baa7 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -806,7 +806,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead.")); create_branch(argv[0], (argc == 2) ? argv[1] : head, - force, reflog, 0, quiet, track); + force, 0, reflog, quiet, track); } else usage_with_options(builtin_branch_usage, options); diff --git a/builtin/checkout.c b/builtin/checkout.c index 7d8bcc3833..6068f8d8cf 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -640,8 +640,8 @@ static void update_refs_for_switch(const struct checkout_opts *opts, else create_branch(opts->new_branch, new->name, opts->new_branch_force ? 1 : 0, - opts->new_branch_log, opts->new_branch_force ? 1 : 0, + opts->new_branch_log, opts->quiet, opts->track); new->name = opts->new_branch; |