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

[RFC PATCH v2] switch: provide configurable detach

From
TCThibaud CANALE <thican@thican.net>
Date
Apr 4, 2026, 21:14 UTC
Message-ID
<3cfgodmlybyme4ggnybudz77tkdshnsi5rn263gv4ta6ru6cq4@o7j7ohf5jlmq>
In-Reply-To
<njuf62lav6akkmdyqutwk7pim5yutw5cuicjidwpe5eh6qnkqr@4ir6q4uhhvht>

Some users won’t change to switch/restore commands and keep relying on checkout command because of this “missing” feature:

For git-switch(1), configurable through option `checkout.switchDetach`, match git-checkout(1)’s detach behavior on non-branch references, such as commit id and "tilde" reference (i.e "${my_branch}~2"). No need to use explicit --detach option, automatically detach on non-branch reference, then reattach when going back on a branch, even implicitly through `git switch -` command. … like git-checkout(1) uses to do.

No impact on current behavior when option is unset or set to false.
Signed-off-by: Thibaud CANALE <thican@thican.net>
---
 Documentation/config/checkout.adoc | 14 ++++++++++++++
 builtin/checkout.c                 | 19 ++++++++++++++++---
 t/t2060-switch.sh                  | 27 +++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/Documentation/config/checkout.adoc b/Documentation/config/checkout.adoc
index e35d2129..5309bed7 100644
--- a/Documentation/config/checkout.adoc
+++ b/Documentation/config/checkout.adoc
@@ -22,6 +22,20 @@ commands or functionality in the future.
 	option in `git checkout` and `git switch`. See
 	linkgit:git-switch[1] and linkgit:git-checkout[1].
 
+`checkout.switchDetach`::
+	For linkgit:git-switch[1], matches linkgit:git-checkout[1]’s detach behavior
+	on non-branch references, such as commit id and "tilde" reference (i.e
+	"${my_branch}~2").
++
+No need to use explicit --detach option, automatically detach on
+non-branch reference, then reattach when going back on a branch, even
+implicitly through `git switch -` command.
++
+… like linkgit:git-checkout[1] uses to do.
++
+No impact when option is unset or set to false, won't continue when trying to
+detach HEAD without explicit --detach option.
+
 `checkout.workers`::
 	The number of parallel workers to use when updating the working tree.
 	The default is one, i.e. sequential execution. If set to a value less
diff --git a/builtin/checkout.c b/builtin/checkout.c
index e031e618..cd7b0a60 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -53,6 +53,7 @@ struct checkout_opts {
 	int force;
 	int force_detach;
 	int implicit_detach;
+	int switch_detach;
 	int writeout_stage;
 	int overwrite_ignore;
 	int ignore_skipworktree;
@@ -1005,7 +1006,10 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
 	else
 		strbuf_insertstr(&msg, 0, reflog_msg);
 
-	if (!strcmp(new_branch_info->name, "HEAD") && !new_branch_info->path && !opts->force_detach) {
+	if (!strcmp(new_branch_info->name, "HEAD") &&
+	    !new_branch_info->path &&
+	    !opts->force_detach &&
+	    !opts->switch_detach) {
 		/* Nothing to do. */
 	} else if (opts->force_detach || !new_branch_info->path) {	/* No longer on any branch. */
 		refs_update_ref(get_main_ref_store(the_repository), msg.buf,
@@ -1014,7 +1018,9 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
 				REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR);
 		if (!opts->quiet) {
 			if (old_branch_info->path &&
-			    advice_enabled(ADVICE_DETACHED_HEAD) && !opts->force_detach)
+			    advice_enabled(ADVICE_DETACHED_HEAD) &&
+			    !opts->force_detach &&
+			    !opts->switch_detach)
 				detach_advice(new_branch_info->name);
 			describe_detached_head(_("HEAD is now at"), new_branch_info->commit);
 		}
@@ -1541,8 +1547,11 @@ static void die_expecting_a_branch(const struct branch_info *branch_info)
 		 */
 		code = die_message(_("a branch is expected, got '%s'"), branch_info->name);
 
-	if (advice_enabled(ADVICE_SUGGEST_DETACHING_HEAD))
+	if (advice_enabled(ADVICE_SUGGEST_DETACHING_HEAD)) {
 		advise(_("If you want to detach HEAD at the commit, try again with the --detach option."));
+		advise(_("You can also detach by default by setting the config "
+		         "variable checkout.switchDetach to true."));
+	}
 
 	exit(code);
 }
@@ -1660,6 +1669,7 @@ static int checkout_branch(struct checkout_opts *opts,
 
 	if (!opts->implicit_detach &&
 	    !opts->force_detach &&
+	    !opts->switch_detach &&
 	    !opts->new_branch &&
 	    !opts->new_branch_force &&
 	    new_branch_info->name &&
@@ -2119,6 +2129,9 @@ int cmd_switch(int argc,
 	options = add_common_options(&opts, options);
 	options = add_common_switch_branch_options(&opts, options);
 
+	repo_config_get_bool(the_repository, "checkout.switchDetach",
+	                     &opts.switch_detach);
+
 	cb_option = 'c';
 
 	return checkout_main(argc, argv, prefix, &opts, options,
diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh
index c91c4db9..3732a826 100755
--- a/t/t2060-switch.sh
+++ b/t/t2060-switch.sh
@@ -177,4 +177,31 @@ test_expect_success 'switch back when temporarily detached and checked out elsew
 	git -C wt2 switch --ignore-other-worktrees shared
 '
 
+test_expect_success 'switch with configured detach behavior from configuration' '
+	test_when_finished "
+		git config --unset checkout.switchDetach;
+		git switch main
+	" &&
+	test_config checkout.switchDetach true &&
+	git switch main &&
+	git symbolic-ref HEAD &&
+	git switch main~ &&
+	test_must_fail git symbolic-ref HEAD &&
+	git switch - &&
+	git symbolic-ref HEAD &&
+	git switch - &&
+	test_must_fail git symbolic-ref HEAD
+'
+
+test_expect_success 'switch without configured detach behavior from configuration' '
+	test_when_finished "
+		git config --unset checkout.switchDetach;
+		git switch main
+	" &&
+	test_config checkout.switchDetach false &&
+	git switch main &&
+	git symbolic-ref HEAD &&
+	test_must_fail git switch main~
+'
+
 test_done

Range-diff against v1:
1:  d9a7ca4c ! 1:  ea7ea74c switch: provide configurable detach
    @@ Metadata
      ## Commit message ##
         switch: provide configurable detach
     
    -    Its purpose is to provide for git-switch(1) same detach behavior on
    -    commit it than git-checkout(1) through configuration option
    -    `checkout.switchDetach`.
    +    Some users won’t change to switch/restore commands and keep relying on
    +    checkout command because of this “missing” feature:
    +
    +    For git-switch(1), configurable through option `checkout.switchDetach`,
    +    match git-checkout(1)’s detach behavior on non-branch references, such
    +    as commit id and "tilde" reference (i.e "${my_branch}~2").
    +    No need to use explicit --detach option, automatically detach on
    +    non-branch reference, then reattach when going back on a branch, even
    +    implicitly through `git switch -` command.
    +    … like git-checkout(1) uses to do.
    +
    +    No impact on current behavior when option is unset or set to false.
     
         Signed-off-by: Thibaud CANALE <thican@thican.net>
     
    @@ Documentation/config/checkout.adoc: commands or functionality in the future.
      	linkgit:git-switch[1] and linkgit:git-checkout[1].
      
     +`checkout.switchDetach`::
    -+	Provides for linkgit:git-switch[1] the same detach behavior on commit id
    -+	than linkgit:git-checkout[1] without the explicit --detach option.
    ++	For linkgit:git-switch[1], matches linkgit:git-checkout[1]’s detach behavior
    ++	on non-branch references, such as commit id and "tilde" reference (i.e
    ++	"${my_branch}~2").
    +++
    ++No need to use explicit --detach option, automatically detach on
    ++non-branch reference, then reattach when going back on a branch, even
    ++implicitly through `git switch -` command.
    +++
    ++… like linkgit:git-checkout[1] uses to do.
    +++
    ++No impact when option is unset or set to false, won't continue when trying to
    ++detach HEAD without explicit --detach option.
     +
      `checkout.workers`::
      	The number of parallel workers to use when updating the working tree.
    @@ builtin/checkout.c: struct checkout_opts {
      	int force;
      	int force_detach;
      	int implicit_detach;
    -+	int switch_detach;  // For checkout.switchDetach configuration
    ++	int switch_detach;
      	int writeout_stage;
      	int overwrite_ignore;
      	int ignore_skipworktree;
    @@ builtin/checkout.c: static void die_expecting_a_branch(const struct branch_info
     -	if (advice_enabled(ADVICE_SUGGEST_DETACHING_HEAD))
     +	if (advice_enabled(ADVICE_SUGGEST_DETACHING_HEAD)) {
      		advise(_("If you want to detach HEAD at the commit, try again with the --detach option."));
    -+		advise(_("Also you can detach by default by setting the config variable "
    -+		         "checkout.switchDetach to true."));
    ++		advise(_("You can also detach by default by setting the config "
    ++		         "variable checkout.switchDetach to true."));
     +	}
      
      	exit(code);
    @@ builtin/checkout.c: int cmd_switch(int argc,
      	options = add_common_options(&opts, options);
      	options = add_common_switch_branch_options(&opts, options);
      
    -+	repo_config_get_bool(the_repository, "checkout.switchDetach", &opts.switch_detach);
    ++	repo_config_get_bool(the_repository, "checkout.switchDetach",
    ++	                     &opts.switch_detach);
     +
      	cb_option = 'c';
      
    @@ t/t2060-switch.sh: test_expect_success 'switch back when temporarily detached an
      	git -C wt2 switch --ignore-other-worktrees shared
      '
      
    -+test_expect_success 'switch with configured detach behavior from configuration ' '
    ++test_expect_success 'switch with configured detach behavior from configuration' '
     +	test_when_finished "
    -+		test_config checkout.switchDetach false;
    ++		git config --unset checkout.switchDetach;
     +		git switch main
     +	" &&
     +	test_config checkout.switchDetach true &&
    @@ t/t2060-switch.sh: test_expect_success 'switch back when temporarily detached an
     +	test_must_fail git symbolic-ref HEAD
     +'
     +
    -+test_expect_success 'switch without configured detach behavior from configuration ' '
    ++test_expect_success 'switch without configured detach behavior from configuration' '
     +	test_when_finished "
    -+		test_config checkout.switchDetach false;
    ++		git config --unset checkout.switchDetach;
     +		git switch main
     +	" &&
     +	test_config checkout.switchDetach false &&
-- 
Thibaud CANALE
thican [at] thican [dot] net
https://thican.net/
GPG: rsa4096 2013-10-14 485EF628CB85CDD4CB7CFF0D52F5127650733A18
Previous: Thibaud CANALENext: Junio C Hamano
Message 6 of 9 in “switch: provide configurable detach”
  1. switch: provide configurable detachThibaud CANALE, Apr 4, 2026
  2. PabloApr 4, 2026
  3. Thibaud CANALEApr 4, 2026
  4. D. Ben KnobleApr 4, 2026
  5. Thibaud CANALEApr 4, 2026
  6. switch: provide configurable detachThibaud CANALE, Apr 4, 2026
  7. Junio C HamanoApr 6, 2026
  8. Kristoffer HaugsbakkApr 6, 2026
  9. Junio C HamanoApr 7, 2026

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.