X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft2020-checkout-detach.sh;h=068fba4c8e8706aa615d0401da1da47901113156;hb=660e20f5c72ba363c08f0d3fca60c9680f296c40;hp=2366f0f4141656666db9cdcd8975335df57b6a8f;hpb=a588f93dcb679dd228c3a0d61002217c06315f35;p=git.git diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh index 2366f0f41..068fba4c8 100755 --- a/t/t2020-checkout-detach.sh +++ b/t/t2020-checkout-detach.sh @@ -12,11 +12,14 @@ check_not_detached () { } ORPHAN_WARNING='you are leaving .* commit.*behind' +PREV_HEAD_DESC='Previous HEAD position was' check_orphan_warning() { - test_i18ngrep "$ORPHAN_WARNING" "$1" + test_i18ngrep "$ORPHAN_WARNING" "$1" && + test_i18ngrep ! "$PREV_HEAD_DESC" "$1" } check_no_orphan_warning() { - test_i18ngrep ! "$ORPHAN_WARNING" "$1" + test_i18ngrep ! "$ORPHAN_WARNING" "$1" && + test_i18ngrep "$PREV_HEAD_DESC" "$1" } reset () {