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

[PATCH 00/32] nd/multiple-work-trees cleanup

From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date
Aug 30, 2014, 08:33 UTC
Message-ID
<1409387642-24492-1-git-send-email-pclouds@gmail.com>

This collapes some bug fix patches into the main ones, adds a few more tests to cover recent changes, and removes advice.checkoutLocked (when things are controversal, probably best to go without them until they are settled). Diff against current version in 'pu'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index b2c3388..57999fa 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -201,10 +201,6 @@ advice.*::
 	rmHints::
 		In case of failure in the output of linkgit:git-rm[1],
 		show directions on how to proceed from the current state.
-	checkoutLocked::
-		In multiple checkout setup, attempting to checkout a
-		branch already checked out elsewhere will fail. Show
-		some useful options to proceed.
 --
 
 core.fileMode::
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index 6bd82af..c9a7d1a 100644
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -139,8 +139,8 @@ is often called 'detached HEAD.'  See linkgit:git-checkout[1]
 for details.
 
 config::
-	Repository specific configuration file. This file is ignored if
-	$GIT_COMMON_DIR is set and "$GIT_COMMON_DIR/config" will be
+	Repository specific configuration file. This file is ignored
+	if $GIT_COMMON_DIR is set and "$GIT_COMMON_DIR/config" will be
 	used instead.
 
 branches::
@@ -218,11 +218,10 @@ remotes::
 	"$GIT_COMMON_DIR/remotes" will be used instead.
 
 logs::
-	Records of changes made to refs are stored in this
-	directory.  See linkgit:git-update-ref[1]
-	for more information. This directory is ignored if
-	$GIT_COMMON_DIR is set and "$GIT_COMMON_DIR/logs" will be used
-	instead.
+	Records of changes made to refs are stored in this directory.
+	See linkgit:git-update-ref[1] for more information. This
+	directory is ignored $GIT_COMMON_DIR is set and
+	"$GIT_COMMON_DIR/logs" will be used instead.
 
 logs/refs/heads/`name`::
 	Records all changes made to the branch tip named `name`.
diff --git a/advice.c b/advice.c
index cf3b0f7..9b42033 100644
--- a/advice.c
+++ b/advice.c
@@ -15,7 +15,6 @@ int advice_detached_head = 1;
 int advice_set_upstream_failure = 1;
 int advice_object_name_warning = 1;
 int advice_rm_hints = 1;
-int advice_checkout_locked = 1;
 
 static struct {
 	const char *name;
@@ -36,7 +35,6 @@ static struct {
 	{ "setupstreamfailure", &advice_set_upstream_failure },
 	{ "objectnamewarning", &advice_object_name_warning },
 	{ "rmhints", &advice_rm_hints },
-	{ "checkoutlocked", &advice_checkout_locked },
 
 	/* make this an alias for backward compatibility */
 	{ "pushnonfastforward", &advice_push_update_rejected }
diff --git a/advice.h b/advice.h
index 935631d..5ecc6c1 100644
--- a/advice.h
+++ b/advice.h
@@ -18,7 +18,6 @@ extern int advice_detached_head;
 extern int advice_set_upstream_failure;
 extern int advice_object_name_warning;
 extern int advice_rm_hints;
-extern int advice_checkout_locked;
 
 int git_default_advice_config(const char *var, const char *value);
 __attribute__((format (printf, 1, 2)))
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3dc416c..b88c646 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -862,7 +862,7 @@ static int prepare_linked_checkout(const struct checkout_opts *opts,
 	if (!new->commit)
 		die(_("no branch specified"));
 	if (file_exists(path))
-		die(_("%s already exists"), path);
+		die(_("'%s' already exists"), path);
 
 	len = strlen(path);
 	while (len && is_dir_sep(path[len - 1]))
@@ -1038,16 +1038,7 @@ static void check_linked_checkout(struct branch_info *new, const char *id)
 		strbuf_rtrim(&gitdir);
 	} else
 		strbuf_addstr(&gitdir, get_git_common_dir());
-	if (advice_checkout_locked)
-		die(_("'%s' is already checked out at %s\n"
-		      "Either go there and continue working, or detach HEAD using\n"
-		      "    git checkout --detach [more options] %s\n"
-		      "or create a new branch based off '%s' using\n"
-		      "    git checkout -b <branch name> [more options] %s\n"
-		      "or switch to another branch at the other checkout and retry."),
-		    new->name, gitdir.buf, new->name, new->name, new->name);
-	else
-		die(_("'%s' is already checked out at %s"), new->name, gitdir.buf);
+	die(_("'%s' is already checked out at '%s'"), new->name, gitdir.buf);
 done:
 	strbuf_release(&path);
 	strbuf_release(&sb);
diff --git a/t/t2025-checkout-to.sh b/t/t2025-checkout-to.sh
index 508993f..aa24ea8 100755
--- a/t/t2025-checkout-to.sh
+++ b/t/t2025-checkout-to.sh
@@ -12,6 +12,11 @@ test_expect_success 'checkout --to not updating paths' '
 	test_must_fail git checkout --to -- init.t
 '
 
+test_expect_success 'checkout --to an existing worktree' '
+	mkdir existing &&
+	test_must_fail git checkout --detach --to existing master
+'
+
 test_expect_success 'checkout --to refuses to checkout locked branch' '
 	test_must_fail git checkout --to zere master &&
 	! test -d zere &&
@@ -31,6 +36,16 @@ test_expect_success 'checkout --to a new worktree' '
 	)
 '
 
+test_expect_success 'checkout --to a new worktree from a subdir' '
+	(
+		mkdir sub &&
+		cd sub &&
+		git checkout --detach --to here master &&
+		cd here &&
+		test_cmp ../../init.t init.t
+	)
+'
+
 test_expect_success 'checkout --to from a linked checkout' '
 	(
 		cd here &&

-- 
2.1.0.rc0.78.gc0d8480
Next: Nguyễn Thái Ngọc Duy
Message 1 of 134 in “nd/multiple-work-trees cleanup”
  1. 00/32 nd/multiple-work-trees cleanupNguyễn Thái Ngọc Duy, Aug 30, 2014
  2. 01/32 path.c: make get_pathname() return strbuf instead of static bufferNguyễn Thái Ngọc Duy, Aug 30, 2014
  3. 02/32 path.c: make get_pathname() call sites return const char *Nguyễn Thái Ngọc Duy, Aug 30, 2014
  4. 03/32 git_snpath(): retire and replace with strbuf_git_path()Nguyễn Thái Ngọc Duy, Aug 30, 2014
  5. 04/32 path.c: rename vsnpath() to do_git_path()Nguyễn Thái Ngọc Duy, Aug 30, 2014
  6. 05/32 path.c: group git_path(), git_pathdup() and strbuf_git_path() togetherNguyễn Thái Ngọc Duy, Aug 30, 2014
  7. 06/32 git_path(): be aware of file relocation in $GIT_DIRNguyễn Thái Ngọc Duy, Aug 30, 2014
  8. 07/32 *.sh: respect $GIT_INDEX_FILENguyễn Thái Ngọc Duy, Aug 30, 2014
  9. 08/32 reflog: avoid constructing .lock path with git_pathNguyễn Thái Ngọc Duy, Aug 30, 2014
  10. 09/32 fast-import: use git_path() for accessing .git dir instead of get_git_dir()Nguyễn Thái Ngọc Duy, Aug 30, 2014
  11. 10/32 commit: use SEQ_DIR instead of hardcoding "sequencer"Nguyễn Thái Ngọc Duy, Aug 30, 2014
  12. 11/32 $GIT_COMMON_DIR: a new environment variableNguyễn Thái Ngọc Duy, Aug 30, 2014
  13. 12/32 git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objectsNguyễn Thái Ngọc Duy, Aug 30, 2014
  14. 13/32 *.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy, Aug 30, 2014
  15. 14/32 git-stash: avoid hardcoding $GIT_DIR/logs/....Nguyễn Thái Ngọc Duy, Aug 30, 2014
  16. 15/32 setup.c: convert is_git_directory() to use strbufNguyễn Thái Ngọc Duy, Aug 30, 2014
  17. 16/32 setup.c: detect $GIT_COMMON_DIR in is_git_directory()Nguyễn Thái Ngọc Duy, Aug 30, 2014
  18. 17/32 setup.c: convert check_repository_format_gently to use strbufNguyễn Thái Ngọc Duy, Aug 30, 2014
  19. 18/32 setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()Nguyễn Thái Ngọc Duy, Aug 30, 2014
  20. 19/32 setup.c: support multi-checkout repo setupNguyễn Thái Ngọc Duy, Aug 30, 2014
  21. 20/32 wrapper.c: wrapper to open a file, fprintf then closeNguyễn Thái Ngọc Duy, Aug 30, 2014
  22. 21/32 use new wrapper write_file() for simple file writingNguyễn Thái Ngọc Duy, Aug 30, 2014
  23. 22/32 checkout: support checking out into a new working directoryNguyễn Thái Ngọc Duy, Aug 30, 2014
  24. Philip OakleyAug 30, 2014
  25. Duy NguyenAug 31, 2014
  26. Duy NguyenAug 31, 2014
  27. Philip OakleyAug 31, 2014
  28. Duy NguyenSep 2, 2014
  29. Marc BranchaudSep 2, 2014
  30. Junio C HamanoSep 2, 2014
  31. Duy NguyenSep 4, 2014
  32. Duy NguyenSep 8, 2014
  33. Marc BranchaudSep 8, 2014
  34. Scott SchmitSep 5, 2014
  35. Duy NguyenSep 5, 2014
  36. 23/32 checkout: clean up half-prepared directories in --to modeNguyễn Thái Ngọc Duy, Aug 30, 2014
  37. 24/32 checkout: reject if the branch is already checked out elsewhereNguyễn Thái Ngọc Duy, Aug 30, 2014
  38. 25/32 prune: strategies for linked checkoutsNguyễn Thái Ngọc Duy, Aug 30, 2014
  39. 26/32 gc: style change -- no SP before closing parenthesisNguyễn Thái Ngọc Duy, Aug 30, 2014
  40. 27/32 gc: factor out gc.pruneexpire parsing codeNguyễn Thái Ngọc Duy, Aug 30, 2014
  41. 28/32 gc: support prune --reposNguyễn Thái Ngọc Duy, Aug 30, 2014
  42. 29/32 count-objects: report unused files in $GIT_DIR/repos/...Nguyễn Thái Ngọc Duy, Aug 30, 2014
  43. 30/32 git_path(): keep "info/sparse-checkout" per work-treeNguyễn Thái Ngọc Duy, Aug 30, 2014
  44. 31/32 checkout: don't require a work tree when checking out into a new oneNguyễn Thái Ngọc Duy, Aug 30, 2014
  45. 32/32 t2025: add a test to make sure grafts is working from a linked checkoutNguyễn Thái Ngọc Duy, Aug 30, 2014
  46. Eric SunshineAug 30, 2014
  47. Duy NguyenAug 30, 2014
  48. Junio C HamanoSep 2, 2014
  49. 00/32 nd/multiple-work-treesNguyễn Thái Ngọc Duy, Sep 10, 2014
  50. 01/32 path.c: make get_pathname() return strbuf instead of static bufferNguyễn Thái Ngọc Duy, Sep 10, 2014
  51. 02/32 path.c: make get_pathname() call sites return const char *Nguyễn Thái Ngọc Duy, Sep 10, 2014
  52. 03/32 git_snpath(): retire and replace with strbuf_git_path()Nguyễn Thái Ngọc Duy, Sep 10, 2014
  53. 04/32 path.c: rename vsnpath() to do_git_path()Nguyễn Thái Ngọc Duy, Sep 10, 2014
  54. 05/32 path.c: group git_path(), git_pathdup() and strbuf_git_path() togetherNguyễn Thái Ngọc Duy, Sep 10, 2014
  55. 06/32 git_path(): be aware of file relocation in $GIT_DIRNguyễn Thái Ngọc Duy, Sep 10, 2014
  56. 07/32 *.sh: respect $GIT_INDEX_FILENguyễn Thái Ngọc Duy, Sep 10, 2014
  57. 08/32 reflog: avoid constructing .lock path with git_pathNguyễn Thái Ngọc Duy, Sep 10, 2014
  58. 09/32 fast-import: use git_path() for accessing .git dir instead of get_git_dir()Nguyễn Thái Ngọc Duy, Sep 10, 2014
  59. 10/32 commit: use SEQ_DIR instead of hardcoding "sequencer"Nguyễn Thái Ngọc Duy, Sep 10, 2014
  60. 11/32 $GIT_COMMON_DIR: a new environment variableNguyễn Thái Ngọc Duy, Sep 10, 2014
  61. 12/32 git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objectsNguyễn Thái Ngọc Duy, Sep 10, 2014
  62. 13/32 *.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy, Sep 10, 2014
  63. 14/32 git-stash: avoid hardcoding $GIT_DIR/logs/....Nguyễn Thái Ngọc Duy, Sep 10, 2014
  64. 15/32 setup.c: convert is_git_directory() to use strbufNguyễn Thái Ngọc Duy, Sep 10, 2014
  65. 16/32 setup.c: detect $GIT_COMMON_DIR in is_git_directory()Nguyễn Thái Ngọc Duy, Sep 10, 2014
  66. 17/32 setup.c: convert check_repository_format_gently to use strbufNguyễn Thái Ngọc Duy, Sep 10, 2014
  67. 18/32 setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()Nguyễn Thái Ngọc Duy, Sep 10, 2014
  68. 19/32 setup.c: support multi-checkout repo setupNguyễn Thái Ngọc Duy, Sep 10, 2014
  69. 20/32 wrapper.c: wrapper to open a file, fprintf then closeNguyễn Thái Ngọc Duy, Sep 10, 2014
  70. 21/32 use new wrapper write_file() for simple file writingNguyễn Thái Ngọc Duy, Sep 10, 2014
  71. 22/32 checkout: support checking out into a new working directoryNguyễn Thái Ngọc Duy, Sep 10, 2014
  72. Marc BranchaudSep 11, 2014
  73. Duy NguyenSep 21, 2014
  74. Eric SunshineSep 21, 2014
  75. Duy NguyenSep 21, 2014
  76. Marc BranchaudSep 22, 2014
  77. Eric SunshineSep 22, 2014
  78. 23/32 prune: strategies for linked checkoutsNguyễn Thái Ngọc Duy, Sep 10, 2014
  79. Marc BranchaudSep 11, 2014
  80. Eric SunshineSep 12, 2014
  81. Marc BranchaudSep 12, 2014
  82. Duy NguyenSep 21, 2014
  83. Eric SunshineSep 21, 2014
  84. Duy NguyenSep 21, 2014
  85. Marc BranchaudSep 22, 2014
  86. Eric SunshineSep 22, 2014
  87. 24/32 checkout: reject if the branch is already checked out elsewhereNguyễn Thái Ngọc Duy, Sep 10, 2014
  88. 25/32 checkout: clean up half-prepared directories in --to modeNguyễn Thái Ngọc Duy, Sep 10, 2014
  89. 26/32 gc: style change -- no SP before closing parenthesisNguyễn Thái Ngọc Duy, Sep 10, 2014
  90. 27/32 gc: factor out gc.pruneexpire parsing codeNguyễn Thái Ngọc Duy, Sep 10, 2014
  91. 28/32 gc: support prune --worktreesNguyễn Thái Ngọc Duy, Sep 10, 2014
  92. Duy NguyenSep 21, 2014
  93. Marc BranchaudSep 22, 2014
  94. 29/32 count-objects: report unused files in $GIT_DIR/worktrees/...Nguyễn Thái Ngọc Duy, Sep 10, 2014
  95. 30/32 git_path(): keep "info/sparse-checkout" per work-treeNguyễn Thái Ngọc Duy, Sep 10, 2014
  96. 31/32 checkout: don't require a work tree when checking out into a new oneNguyễn Thái Ngọc Duy, Sep 10, 2014
  97. 32/32 t2025: add a test to make sure grafts is working from a linked checkoutNguyễn Thái Ngọc Duy, Sep 10, 2014
  98. Junio C HamanoSep 25, 2014
  99. 00/32 nd/multiple-work-treesNguyễn Thái Ngọc Duy, Sep 28, 2014
  100. 01/32 path.c: make get_pathname() return strbuf instead of static bufferNguyễn Thái Ngọc Duy, Sep 28, 2014
  101. 02/32 path.c: make get_pathname() call sites return const char *Nguyễn Thái Ngọc Duy, Sep 28, 2014
  102. 03/32 git_snpath(): retire and replace with strbuf_git_path()Nguyễn Thái Ngọc Duy, Sep 28, 2014
  103. 04/32 path.c: rename vsnpath() to do_git_path()Nguyễn Thái Ngọc Duy, Sep 28, 2014
  104. 05/32 path.c: group git_path(), git_pathdup() and strbuf_git_path() togetherNguyễn Thái Ngọc Duy, Sep 28, 2014
  105. 06/32 git_path(): be aware of file relocation in $GIT_DIRNguyễn Thái Ngọc Duy, Sep 28, 2014
  106. 07/32 *.sh: respect $GIT_INDEX_FILENguyễn Thái Ngọc Duy, Sep 28, 2014
  107. 08/32 reflog: avoid constructing .lock path with git_pathNguyễn Thái Ngọc Duy, Sep 28, 2014
  108. 09/32 fast-import: use git_path() for accessing .git dir instead of get_git_dir()Nguyễn Thái Ngọc Duy, Sep 28, 2014
  109. 10/32 commit: use SEQ_DIR instead of hardcoding "sequencer"Nguyễn Thái Ngọc Duy, Sep 28, 2014
  110. 11/32 $GIT_COMMON_DIR: a new environment variableNguyễn Thái Ngọc Duy, Sep 28, 2014
  111. 12/32 git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objectsNguyễn Thái Ngọc Duy, Sep 28, 2014
  112. 13/32 *.sh: avoid hardcoding $GIT_DIR/hooks/...Nguyễn Thái Ngọc Duy, Sep 28, 2014
  113. 14/32 git-stash: avoid hardcoding $GIT_DIR/logs/....Nguyễn Thái Ngọc Duy, Sep 28, 2014
  114. 15/32 setup.c: convert is_git_directory() to use strbufNguyễn Thái Ngọc Duy, Sep 28, 2014
  115. 16/32 setup.c: detect $GIT_COMMON_DIR in is_git_directory()Nguyễn Thái Ngọc Duy, Sep 28, 2014
  116. 17/32 setup.c: convert check_repository_format_gently to use strbufNguyễn Thái Ngọc Duy, Sep 28, 2014
  117. 18/32 setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()Nguyễn Thái Ngọc Duy, Sep 28, 2014
  118. 19/32 setup.c: support multi-checkout repo setupNguyễn Thái Ngọc Duy, Sep 28, 2014
  119. Johannes SixtOct 1, 2014
  120. 20/32 wrapper.c: wrapper to open a file, fprintf then closeNguyễn Thái Ngọc Duy, Sep 28, 2014
  121. 21/32 use new wrapper write_file() for simple file writingNguyễn Thái Ngọc Duy, Sep 28, 2014
  122. 22/32 checkout: support checking out into a new working directoryNguyễn Thái Ngọc Duy, Sep 28, 2014
  123. 23/32 prune: strategies for linked checkoutsNguyễn Thái Ngọc Duy, Sep 28, 2014
  124. Johannes SixtOct 1, 2014
  125. 24/32 checkout: reject if the branch is already checked out elsewhereNguyễn Thái Ngọc Duy, Sep 28, 2014
  126. 25/32 checkout: clean up half-prepared directories in --to modeNguyễn Thái Ngọc Duy, Sep 28, 2014
  127. 26/32 gc: style change -- no SP before closing parenthesisNguyễn Thái Ngọc Duy, Sep 28, 2014
  128. 27/32 gc: factor out gc.pruneexpire parsing codeNguyễn Thái Ngọc Duy, Sep 28, 2014
  129. 28/32 gc: support prune --worktreesNguyễn Thái Ngọc Duy, Sep 28, 2014
  130. 29/32 count-objects: report unused files in $GIT_DIR/worktrees/...Nguyễn Thái Ngọc Duy, Sep 28, 2014
  131. 30/32 git_path(): keep "info/sparse-checkout" per work-treeNguyễn Thái Ngọc Duy, Sep 28, 2014
  132. 31/32 checkout: don't require a work tree when checking out into a new oneNguyễn Thái Ngọc Duy, Sep 28, 2014
  133. 32/32 t2025: add a test to make sure grafts is working from a linked checkoutNguyễn Thái Ngọc Duy, Sep 28, 2014
  134. Junio C HamanoSep 28, 2014

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.