revert: Eliminate global "commit" variable

diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index ab782e22fd0a56d4c0212ef0c7fc828aa12f8ece..2366f0f4141656666db9cdcd8975335df57b6a8f 100755 (executable)
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -13,10 +13,10 @@ check_not_detached () {
 
 ORPHAN_WARNING='you are leaving .* commit.*behind'
 check_orphan_warning() {
-       grep "$ORPHAN_WARNING" "$1"
+       test_i18ngrep "$ORPHAN_WARNING" "$1"
 }
 check_no_orphan_warning() {
-       ! grep "$ORPHAN_WARNING" "$1"
+       test_i18ngrep ! "$ORPHAN_WARNING" "$1"
 }
 
 reset () {
@@ -111,7 +111,7 @@ test_expect_success 'checkout warns on orphan commits' '
        git checkout master 2>stderr
 '
 
-test_expect_success C_LOCALE_OUTPUT 'checkout warns on orphan commits: output' '
+test_expect_success 'checkout warns on orphan commits: output' '
        check_orphan_warning stderr
 '
 
@@ -121,7 +121,7 @@ test_expect_success 'checkout does not warn leaving ref tip' '
        git checkout master 2>stderr
 '
 
-test_expect_success C_LOCALE_OUTPUT 'checkout does not warn leaving ref tip' '
+test_expect_success 'checkout does not warn leaving ref tip' '
        check_no_orphan_warning stderr
 '
 
@@ -131,7 +131,7 @@ test_expect_success 'checkout does not warn leaving reachable commit' '
        git checkout master 2>stderr
 '
 
-test_expect_success C_LOCALE_OUTPUT 'checkout does not warn leaving reachable commit' '
+test_expect_success 'checkout does not warn leaving reachable commit' '
        check_no_orphan_warning stderr
 '