diff options
| author |  René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2011-10-01 17:38:34 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-10-03 11:02:25 -0700 |
| commit | 83933c9832af91a71337e429a6251f1a3b6d6f60 (patch) | |
| tree | 3790df6585ede74fb27d3c28281adbd4a8225d10 | |
| parent | Git 1.7.6 (diff) | |
| download | tgif-83933c9832af91a71337e429a6251f1a3b6d6f60.tar.xz | |
checkout: check for "Previous HEAD" notice in t2020
If we leave a detached head, exactly one of two things happens: either
checkout warns about it being an orphan or describes it as a courtesy.
Test t2020 already checked that the warning is shown as needed. This
patch also checks for the description.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t2020-checkout-detach.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh index 2366f0f414..068fba4c8e 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 () { |