Merge branch 'jc/am-options'

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 9aae4965dac0f2bf4bb8684c4b8d43dcb60529e9..9e679b402dc826185377c431d353decd8a8a2bed 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -323,4 +323,16 @@ test_expect_success 'auto tag following fetches minimum' '
        )
 '
 
+test_expect_success 'refuse to fetch into the current branch' '
+
+       test_must_fail git fetch . side:master
+
+'
+
+test_expect_success 'fetch into the current branch with --update-head-ok' '
+
+       git fetch --update-head-ok . side:master
+
+'
+
 test_done