Switch on another branch (create if not exists), without checking if already exists?
GitBranchGit Problem Overview
git checkout -b foo
switches on foo
branch (even if it doesn't exist, it is created), but if the foo
branch already exists it throws an error like this:
fatal: A branch named 'foo' already exists.
What's the command that does the following check?
- if the branch already exists, just switch on it (
git checkout foo
) - if the branch doesn't exist, create it and switch on it (
git checkout -b foo
)
Git Solutions
Solution 1 - Git
Update Q3 2019 (Git 2.23): there now actually is a git switch
command!
git switch -c aBranch
You would need a similar alias though:
switchoc = "!f() { git switch $1 2>/dev/null || git switch -c $1; }; f"
Note the name of the alias: switchoc (for "switch or create").
As jar
pointed out in the comments:
> Anyone trying this in 2021, note that you cannot shadow existing git
commands with aliases.
Since git switch
is a git
command, this alias (named "switch
") won't work. You must create your unique name for the alias, like "switchit
" or something.
bgusach's alias mentioned below in the comment is safer (based on Jiří Pavelka 's answer):
switch = "!f() { git checkout $1 2>/dev/null || git checkout -b $1; }; f"
git switch abranch
Original answer (2014) You can try:
git checkout -B foo
From git checkout
man page:
> If -B
is given, <new_branch>
is created if it doesn’t exist; otherwise, it is reset. This is the transactional equivalent of
$ git branch -f <branch> [<start point>]
$ git checkout <branch>
As mentioned below, use it with caution as it does reset the branch, which is not always desirable.
If you did reset the branch by mistake with this command, you can easily revert to its previous state with:
git reset HEAD@{1}
Solution 2 - Git
Agreed with ssmith. Had the same problem and -B
does not solve it, coz of reset. His solution works, however my solution looks simpler:
git checkout foo || git checkout -b foo
That works for me :)
EDIT
Without error output iff foo not exists
git checkout foo 2>/dev/null || git checkout -b foo
Solution 3 - Git
Note the rather important fact that -B
will reset an existing branch before checking it out, which I don't believe @Ionica wants according to his question.
I certainly didn't, so the best one-liner I could come up with is this:
git checkout $(git show-ref --verify --quiet refs/heads/<branch> || echo '-b') <branch>
This can be made into a handy alias like so:
[alias]
# git cob <branch>
cob = "!f() { git checkout $(git show-ref --verify --quiet refs/heads/\"$1\" || echo '-b') \"$1\"; }; f"
Solution 4 - Git
The command checkout -b
creates a new branch and then checks out to that branch. So, if a branch already exists, it cannot create a new one.
Instead you need to do:
git checkout -B <branchname>
The above command does in a context sensitive way. If there's a branch, it switches, if not, it creates and checkout.
Solution 5 - Git
Not very different from what George Pavelka suggested, but instead of relying on status of "git checkout
git show-branch <branch> &>/dev/null && git checkout <branch> || git checkout -b <branch>