[PATCH v2 06/20] checkout: check_linked_checkout: improve "already checked out" aesthetic
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Jul 16, 2015, 08:20 UTC
- Message-ID
- <1437034825-32054-7-git-send-email-sunshine@sunshineco.com>
- In-Reply-To
- <1437034825-32054-1-git-send-email-sunshine@sunshineco.com>
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 mildly misleading and a bit unsightly due to the trailing "/.git". For the user, "/some/path" is significant, whereas "/.git" is mere noise, so drop it.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> ---
New in v2.
builtin/checkout.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/builtin/checkout.c b/builtin/checkout.c index 177ad6a..a331345 100644 --- 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);
-- 2.5.0.rc2.378.g0af52e8