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

diff --git a/t/t0005-signals.sh b/t/t0005-signals.sh
index 93e58c00e886db22b5ebf86af103efc4e65ec832..981437b3a88b86ee1ddd26f842a0048b8dc2b57f 100755 (executable)
--- a/t/t0005-signals.sh
+++ b/t/t0005-signals.sh
@@ -20,4 +20,11 @@ test_expect_success 'sigchain works' '
        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