diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 0470a81be0edaf883788d313778ef6865ed34c6f..0e5eb678ce6b2f4fad79c39947455e5284313ba4 100755 (executable)
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
test_cmp file cloned-uho/file
'
+test_expect_success 'pulling into void does not overwrite untracked files' '
+ git init cloned-untracked &&
+ (
+ cd cloned-untracked &&
+ echo untracked >file &&
+ test_must_fail git pull .. master &&
+ echo untracked >expect &&
+ test_cmp expect file
+ )
+'
+
test_expect_success 'test . as a remote' '
git branch copy master &&