Re: [PATCHv3] checkout: do not mention detach advice for explicit --detach option
From: Junio C Hamano <hidden>
Date: 2016-08-12 16:12:34
Stefan Beller [off-list ref] writes:
When a user asked for a detached HEAD specifically with `--detach`, we do not need to give advice on what a detached HEAD state entails as we can assume they know what they're getting into as they asked for it. Signed-off-by: Stefan Beller <redacted> --- Thanks for the review!quoted
Is there a reason for not unsetting `advice.detachedHead` at the end of the test?done I did not consider to clean up after myself... what a selfish world!
;-) Using test_config instead of "git config" would help.
+test_expect_success 'no advice given for explicit detached head state' ' + git config advice.detachedHead false && + git checkout child && + git checkout --detach HEAD >expect && + git config advice.detachedHead true && + git checkout child && + git checkout --detach HEAD >actual && + test_cmp expect actual &&
The above is meant to see explicit "--detach" gives the same message whether advice.detachedHead is set to true or false, which is good. It however does not make sure these messages do not caution about detaching.
+ git checkout child && + git checkout HEAD >actual &&
This goes to "child" branch and then does a no-op "checkout HEAD" that does not even detach.
+ ! test_cmp expect actual &&
And then it compares the message from a no-op "checkout" and
the previously obtained message from a detaching "checkout".
Another thing that this is not checking is that a detaching
"checkout" without an explicit "--detach" still gives the advice
when advice.detachedHead is set to true (or left to default, for
that matter).
Perhaps you would want to do it a bit differently. How does this
look?
# baseline
test_config advice.detachedHead true &&
git checkout child && git checkout HEAD^0 >expect.advice &&
test_config advice.detachedHead false &&
git checkout child && git checkout HEAD^0 >expect.no-advice &&
test_unconfig advice.detachedHead &&
# without configuration, the advice.* variables default to true
git checkout child && git checkout HEAD^0 >actual &&
test_cmp expect.advice actual &&
# with explicit --detach
# no configuration
test_unconfig advice.detachedHead &&
git checkout child && git checkout --detach HEAD >actual &&
test_cmp expect.no-advice actual &&
# explicitly ask advice
test_config advice.detachedHead true &&
git checkout child && git checkout --detach HEAD >actual &&
test_cmp expect.no-advice actual &&
# explicitly decline advice
test_config advice.detachedHead false &&
git checkout child && git checkout --detach HEAD >actual &&
test_cmp expect.no-advice actual
It might be controversial how the second from the last case should
behave, though.