X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft2020-checkout-detach.sh;h=068fba4c8e8706aa615d0401da1da47901113156;hb=78f4c9f62549fdd9a52550449c4e3148e7e0900d;hp=2366f0f4141656666db9cdcd8975335df57b6a8f;hpb=916034b93ce45bdedfb1c5cef270e6eba2a26fea;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 () {