gpg-interface: allow use of a custom GPG binary

diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index ab782e22fd0a56d4c0212ef0c7fc828aa12f8ece..068fba4c8e8706aa615d0401da1da47901113156 100755 (executable)
--- 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() {
-       grep "$ORPHAN_WARNING" "$1"
+       test_i18ngrep "$ORPHAN_WARNING" "$1" &&
+       test_i18ngrep ! "$PREV_HEAD_DESC" "$1"
 }
 check_no_orphan_warning() {
-       ! grep "$ORPHAN_WARNING" "$1"
+       test_i18ngrep ! "$ORPHAN_WARNING" "$1" &&
+       test_i18ngrep "$PREV_HEAD_DESC" "$1"
 }
 
 reset () {
@@ -111,7 +114,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 +124,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 +134,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
 '