checkout: check_linked_checkout: improve "already checked out" aesthetic

When check_linked_checkout() discovers that the branch is already
checked out elsewhere, it emits the diagnostic:

'blorp' is already checked out at '/some/path/.git'

which is misleading since "checked out at" implies the working tree, but
".git" is the location of the repository administrative files. Fix by
dropping ".git" from the message.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 177ad6a2d7c87cb0e9e2f569e05f26a28f78ee6f..de6619f4c503792ae727e3862a36712ca0e06e6a 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -909,6 +909,7 @@ static void check_linked_checkout(const char *branch, const char *id)
        } else
                strbuf_addstr(&gitdir, get_git_common_dir());
        skip_prefix(branch, "refs/heads/", &branch);
+       strbuf_strip_suffix(&gitdir, ".git");
        die(_("'%s' is already checked out at '%s'"), branch, gitdir.buf);
 done:
        strbuf_release(&path);