checkout: advice how to get out of detached HEAD mode

Detached HEAD mode is considered dangerous and confusing for newcomers
and we print a big block of warning how to move forward. But we should
also suggest the user the way to get out of it if they get into detached
HEAD by mistake.

While at there, I also suggest how to turn the advice off. This is
another thing I find annoying with advices and should be dealt with in a
more generic way. But that may require some refactoring in advice.c
first.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/advice.c b/advice.c
index 567209aa79afee0443dd0d7049343e1a004ae784..b2248256376b5225a597e7d439106985d7f07075 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -191,13 +191,22 @@ void NORETURN die_conclude_merge(void)
 void detach_advice(const char *new_name)
 {
        const char *fmt =
 void detach_advice(const char *new_name)
 {
        const char *fmt =

-       _("Note: checking out '%s'.\n\n"
+       _("Note: checking out '%s'.\n"
+       "\n"

        "You are in 'detached HEAD' state. You can look around, make experimental\n"
        "changes and commit them, and you can discard any commits you make in this\n"
        "You are in 'detached HEAD' state. You can look around, make experimental\n"
        "changes and commit them, and you can discard any commits you make in this\n"

-       "state without impacting any branches by performing another checkout.\n\n"
+       "state without impacting any branches by performing another checkout.\n"
+       "\n"

        "If you want to create a new branch to retain commits you create, you may\n"
        "If you want to create a new branch to retain commits you create, you may\n"

-       "do so (now or later) by using -b with the checkout command again. Example:\n\n"
-       "  git checkout -b <new-branch-name>\n\n");
+       "do so (now or later) by using -b with the checkout command again. Example:\n"
+       "\n"
+       "  git checkout -b <new-branch-name>\n"
+       "\n"
+       "Or undo this checkout with:\n"
+       "\n"
+       "  git checkout -\n"
+       "\n"
+       "Turn off this advice by setting config variable advice.detachedHead to false\n\n");

 
        fprintf(stderr, fmt, new_name);
 }
 
        fprintf(stderr, fmt, new_name);
 }

diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index 1fa670625c5be87294eec9c5fe86bf2defff2ce2..743c7248a21d6967c0717973830dc1393f5109ef 100755 (executable)
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -206,6 +206,12 @@ test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not as
 
          git checkout -b <new-branch-name>
 
 
          git checkout -b <new-branch-name>
 

+       Or undo this checkout with:
+
+         git checkout -
+
+       Turn off this advice by setting config variable advice.detachedHead to false
+

        HEAD is now at \$commit three
        EOF
 
        HEAD is now at \$commit three
        EOF
 


@@ -282,6 +288,12 @@ test_expect_success 'describe_detached_head does print SHA-1 ellipsis when asked
 
          git checkout -b <new-branch-name>
 
 
          git checkout -b <new-branch-name>
 

+       Or undo this checkout with:
+
+         git checkout -
+
+       Turn off this advice by setting config variable advice.detachedHead to false
+

        HEAD is now at \$commit... three
        EOF
 
        HEAD is now at \$commit... three
        EOF