Skip to content

Commit

Permalink
checkout: add basic tests for detached-orphan warning
Browse files Browse the repository at this point in the history
Commit 8e2dc6a added a warning when we leave a detached
HEAD whose commit is not reachable from any ref tip. Let's
add a few basic tests to make sure it works.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Mar 20, 2011
1 parent a91df69 commit 493dd6e
Showing 1 changed file with 34 additions and 0 deletions.
34 changes: 34 additions & 0 deletions t/t2020-checkout-detach.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ check_not_detached () {
git symbolic-ref -q HEAD >/dev/null
}

ORPHAN_WARNING='you are leaving .* commit.*behind'
check_orphan_warning() {
grep "$ORPHAN_WARNING" "$1"
}
check_no_orphan_warning() {
! grep "$ORPHAN_WARNING" "$1"
}

reset () {
git checkout master &&
check_not_detached
Expand All @@ -19,6 +27,8 @@ reset () {
test_expect_success 'setup' '
test_commit one &&
test_commit two &&
test_commit three && git tag -d three &&
test_commit four && git tag -d four &&
git branch branch &&
git tag tag
'
Expand Down Expand Up @@ -92,4 +102,28 @@ test_expect_success 'checkout --detach moves HEAD' '
git diff --exit-code two
'

test_expect_success 'checkout warns on orphan commits' '
reset &&
git checkout --detach two &&
echo content >orphan &&
git add orphan &&
git commit -a -m orphan &&
git checkout master 2>stderr &&
check_orphan_warning stderr
'

test_expect_success 'checkout does not warn leaving ref tip' '
reset &&
git checkout --detach two &&
git checkout master 2>stderr &&
check_no_orphan_warning stderr
'

test_expect_success 'checkout does not warn leaving reachable commit' '
reset &&
git checkout --detach HEAD^ &&
git checkout master 2>stderr &&
check_no_orphan_warning stderr
'

test_done

0 comments on commit 493dd6e

Please sign in to comment.