Merge branch 'sg/commit-graph-validate'

diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index 1fa670625c5be87294eec9c5fe86bf2defff2ce2..b748db9946eff1f1c4f45ffae61ee84f15db0f05 100755 (executable)
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -195,16 +195,22 @@ test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not as
 
        # The first detach operation is more chatty than the following ones.
        cat >1st_detach <<-EOF &&
-       Note: checking out 'HEAD^'.
+       Note: switching to 'HEAD^'.
 
        You are in 'detached HEAD' state. You can look around, make experimental
        changes and commit them, and you can discard any commits you make in this
-       state without impacting any branches by performing another checkout.
+       state without impacting any branches by switching back to a branch.
 
        If you want to create a new branch to retain commits you create, you may
-       do so (now or later) by using -b with the checkout command again. Example:
+       do so (now or later) by using -c with the switch command. Example:
 
-         git checkout -b <new-branch-name>
+         git switch -c <new-branch-name>
+
+       Or undo this operation with:
+
+         git switch -
+
+       Turn off this advice by setting config variable advice.detachedHead to false
 
        HEAD is now at \$commit three
        EOF
@@ -271,16 +277,22 @@ test_expect_success 'describe_detached_head does print SHA-1 ellipsis when asked
 
        # The first detach operation is more chatty than the following ones.
        cat >1st_detach <<-EOF &&
-       Note: checking out 'HEAD^'.
+       Note: switching to 'HEAD^'.
 
        You are in 'detached HEAD' state. You can look around, make experimental
        changes and commit them, and you can discard any commits you make in this
-       state without impacting any branches by performing another checkout.
+       state without impacting any branches by switching back to a branch.
 
        If you want to create a new branch to retain commits you create, you may
-       do so (now or later) by using -b with the checkout command again. Example:
+       do so (now or later) by using -c with the switch command. Example:
+
+         git switch -c <new-branch-name>
+
+       Or undo this operation with:
+
+         git switch -
 
-         git checkout -b <new-branch-name>
+       Turn off this advice by setting config variable advice.detachedHead to false
 
        HEAD is now at \$commit... three
        EOF