• Junio C Hamano's avatar
    branch --set-upstream: regression fix · fa799376
    Junio C Hamano authored
    The "git branch" command, while not in listing mode, calls create_branch()
    even when the target branch already exists, and it does so even when it is
    not interested in updating the value of the branch (i.e. the name of the
    commit object that sits at the tip of the existing branch). This happens
    when the command is run with "--set-upstream" option.
    The earlier safety-measure to prevent "git branch -f $branch $commit" from
    updating the currently checked out branch did not take it into account,
    and we no longer can update the tracking information of the current branch.
    Minimally fix this regression by telling the validation code if it is
    called to really update the value of a potentially existing branch, or if
    the caller merely is interested in updating auxiliary aspects of a branch.
    Reported-and-Tested-by: Jay Soffian
    Signed-off-by: default avatarJunio C Hamano <[email protected]>
branch.c 19.1 KB