Use "git merge" instead of "git pull ."

diff --git a/t/t0005-signals.sh b/t/t0005-signals.sh
index 09f855af3e9cded903c828f3f946a0c2403ddcdf..981437b3a88b86ee1ddd26f842a0048b8dc2b57f 100755 (executable)
--- a/t/t0005-signals.sh
+++ b/t/t0005-signals.sh
@@ -13,10 +13,18 @@ test_expect_success 'sigchain works' '
        test-sigchain >actual
        case "$?" in
        143) true ;; # POSIX w/ SIGTERM=15
+       271) true ;; # ksh w/ SIGTERM=15
          3) true ;; # Windows
          *) false ;;
        esac &&
        test_cmp expect actual
 '
 
+test_expect_success !MINGW 'signals are propagated using shell convention' '
+       # we use exec here to avoid any sub-shell interpretation
+       # of the exit code
+       git config alias.sigterm "!exec test-sigchain" &&
+       test_expect_code 143 git sigterm
+'
+
 test_done