diff options
author | Thomas Gummerer <t.gummerer@gmail.com> | 2018-04-24 22:56:35 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-04-30 09:06:34 +0900 |
commit | f60a7b763fe070161b332d3878f81a7f09ab6e44 (patch) | |
tree | 0359d260102a9bfd21292a4bf3a7fe6eb83d0377 /contrib/coccinelle/object_id.cocci | |
parent | worktree: factor out dwim_branch function (diff) | |
download | tgif-f60a7b763fe070161b332d3878f81a7f09ab6e44.tar.xz |
worktree: teach "add" to check out existing branches
Currently 'git worktree add <path>' creates a new branch named after the
basename of the path by default. If a branch with that name already
exists, the command refuses to do anything, unless the '--force' option
is given.
However we can do a little better than that, and check the branch out if
it is not checked out anywhere else. This will help users who just want
to check an existing branch out into a new worktree, and save a few
keystrokes.
As the current behaviour is to simply 'die()' when a branch with the name
of the basename of the path already exists, there are no backwards
compatibility worries here.
We will still 'die()' if the branch is checked out in another worktree,
unless the --force flag is passed.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/coccinelle/object_id.cocci')
0 files changed, 0 insertions, 0 deletions