kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Eric Sunshine 2015-07-17 19:00:01 -04:00 committed by Junio C Hamano
parent 4341460d92
commit 39e69e1519
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/checkout.c
View File

@ -909,6 +909,7 @@ static void check_linked_checkout(const char *branch, const char *id)
} else } else
strbuf_addstr(&gitdir, get_git_common_dir()); strbuf_addstr(&gitdir, get_git_common_dir());
skip_prefix(branch, "refs/heads/", &branch); skip_prefix(branch, "refs/heads/", &branch);
strbuf_strip_suffix(&gitdir, ".git");
die(_("'%s' is already checked out at '%s'"), branch, gitdir.buf); die(_("'%s' is already checked out at '%s'"), branch, gitdir.buf);
done: done:
strbuf_release(&path); strbuf_release(&path);