Merge branch 'ah/send-email-sendmail-alias'

diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index 453aba53f45e34f6b17bcad7628f4224d6c2de4c..56e7377189acdfed6fa76b8d9c4214974ba11394 100755 (executable)
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -117,4 +117,17 @@ test_expect_success 'git pull --all' '
        )
 '
 
+test_expect_success 'git pull --dry-run' '
+       test_when_finished "rm -rf clonedry" &&
+       git init clonedry &&
+       (
+               cd clonedry &&
+               git pull --dry-run ../parent &&
+               test_path_is_missing .git/FETCH_HEAD &&
+               test_path_is_missing .git/refs/heads/master &&
+               test_path_is_missing .git/index &&
+               test_path_is_missing file
+       )
+'
+
 test_done