git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 06/22] checkout: check_linked_checkout: improve "already checked out" aesthetic

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Jul 17, 2015, 23:00 UTC
Message-ID
<1437174017-81687-7-git-send-email-sunshine@sunshineco.com>
In-Reply-To
<1437174017-81687-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 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>
---

Changes since v2: strip only trailing ".git" rather than "/.git" from "already checked" diagnostic[1]; reword commit message to better emphasize that trailing ".git" is more than a mere cosmetic issue[1]

[1]: http://article.gmane.org/gmane.comp.version-control.git/274035
 builtin/checkout.c | 1 +
 1 file changed, 1 insertion(+)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 177ad6a..de6619f 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
Previous: Eric SunshineNext: Eric Sunshine
Message 7 of 24 in “rid git-checkout of too-intimate knowledge of new worktree”
  1. 00/22 rid git-checkout of too-intimate knowledge of new worktreeEric Sunshine, Jul 17, 2015
  2. 01/22 checkout: avoid resolving HEAD unnecessarilyEric Sunshine, Jul 17, 2015
  3. 02/22 checkout: name check_linked_checkouts() more meaningfullyEric Sunshine, Jul 17, 2015
  4. 03/22 checkout: improve die_if_checked_out() robustnessEric Sunshine, Jul 17, 2015
  5. 04/22 checkout: die_if_checked_out: simplify strbuf managementEric Sunshine, Jul 17, 2015
  6. 05/22 checkout: generalize die_if_checked_out() branch name argumentEric Sunshine, Jul 17, 2015
  7. 06/22 checkout: check_linked_checkout: improve "already checked out" aestheticEric Sunshine, Jul 17, 2015
  8. 07/22 checkout: check_linked_checkout: simplify symref parsingEric Sunshine, Jul 17, 2015
  9. 08/22 checkout: teach check_linked_checkout() about symbolic link HEADEric Sunshine, Jul 17, 2015
  10. 09/22 branch: publish die_if_checked_out()Eric Sunshine, Jul 17, 2015
  11. 10/22 worktree: improve worktree setup messageEric Sunshine, Jul 17, 2015
  12. 11/22 worktree: simplify new branch (-b/-B) option checkingEric Sunshine, Jul 17, 2015
  13. 12/22 worktree: introduce options containerEric Sunshine, Jul 17, 2015
  14. 13/22 worktree: make --detach mutually exclusive with -b/-BEric Sunshine, Jul 17, 2015
  15. 14/22 worktree: add: suppress auto-vivication with --detach and no <branch>Eric Sunshine, Jul 17, 2015
  16. Eric SunshineJul 17, 2015
  17. 15/22 worktree: make branch creation distinct from worktree populationEric Sunshine, Jul 17, 2015
  18. 16/22 worktree: elucidate environment variables intended for child processesEric Sunshine, Jul 17, 2015
  19. 17/22 worktree: add_worktree: construct worktree-population command locallyEric Sunshine, Jul 17, 2015
  20. 18/22 worktree: detect branch-name/detached and error conditions locallyEric Sunshine, Jul 17, 2015
  21. 19/22 worktree: make setup of new HEAD distinct from worktree populationEric Sunshine, Jul 17, 2015
  22. 20/22 worktree: avoid resolving HEAD unnecessarilyEric Sunshine, Jul 17, 2015
  23. 21/22 worktree: populate via "git reset --hard" rather than "git checkout"Eric Sunshine, Jul 17, 2015
  24. 22/22 checkout: drop intimate knowledge of newly created worktreeEric Sunshine, Jul 17, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.