diff options
| author |  Kazuki Yamaguchi <k@rhe.jp> | 2016-03-29 18:38:39 +0900 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-03-29 13:05:53 -0700 |
| commit | f292244c04d8109ee32a45016ce08984fbd925f0 (patch) | |
| tree | 2c492ec3099cd457f385cde6c1fc833f5bb8157d /mergetools/araxis | |
| parent | Merge branch 'mm/doc-hooks-linkgit-fix' into maint (diff) | |
| download | tgif-f292244c04d8109ee32a45016ce08984fbd925f0.tar.xz | |
branch -d: refuse deleting a branch which is currently checked out
When a branch is checked out by current working tree, deleting the
branch is forbidden. However when the branch is checked out only by
other working trees, deleting incorrectly succeeds.
Use find_shared_symref() to check if the branch is in use, not just
comparing with the current working tree's HEAD.
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Kazuki Yamaguchi <k@rhe.jp>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/araxis')
0 files changed, 0 insertions, 0 deletions