]> git.ipfire.org Git - thirdparty/git.git/commit - branch.c
branch: make create_branch() always create a branch
authorGlen Choo <chooglen@google.com>
Sat, 29 Jan 2022 00:04:42 +0000 (16:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 1 Feb 2022 22:18:49 +0000 (14:18 -0800)
commitbc0893cf3b0ee376ef5b6ed293b1525480a9d720
tree4bb458d2053d0a84494e0417dbd156e421314893
parente89f151db13684924feb0cd0a0ca3a13c1d71516
branch: make create_branch() always create a branch

With the previous commit, there are no more invocations of
create_branch() that do not create a branch because:

* BRANCH_TRACK_OVERRIDE is no longer passed
* clobber_head_ok = true and force = false is never passed

Assert these situations, delete dead code and ensure that we're handling
clobber_head_ok and force correctly by introducing tests for `git branch
--force`. As a result, create_branch() now always creates a branch.

Helped-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Glen Choo <chooglen@google.com>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
branch.c
branch.h
t/t3200-branch.sh