diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-10-13 13:45:40 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-13 17:11:41 +0900 |
| commit | bc1c9c0e674bdd293c29ae84365915848ed01d7a (patch) | |
| tree | ddde1bceda59ec50837294f152d49834aa9d6bdd /builtin/checkout.c | |
| parent | branch: streamline "attr_only" handling in validate_new_branchname() (diff) | |
| download | tgif-bc1c9c0e674bdd293c29ae84365915848ed01d7a.tar.xz | |
branch: split validate_new_branchname() into two
Checking if a proposed name is appropriate for a branch is strictly
a subset of checking if we want to allow creating or updating a
branch with such a name. The mysterious sounding 'attr_only'
parameter to validate_new_branchname() is used to switch the
function between these two roles.
Instead, split the function into two, and adjust the callers. A new
helper validate_branchname() only checks the name and reports if the
branch already exists.
This loses one NEEDSWORK from the branch API.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index fc4f8fd2ea..697ac7dcaf 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1289,11 +1289,11 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) if (opts.new_branch) { struct strbuf buf = STRBUF_INIT; - opts.branch_exists = - validate_new_branchname(opts.new_branch, &buf, - !!opts.new_branch_force, - !!opts.new_branch_force); - + if (opts.new_branch_force) + opts.branch_exists = validate_branchname(opts.new_branch, &buf); + else + opts.branch_exists = + validate_new_branchname(opts.new_branch, &buf, 0); strbuf_release(&buf); } |