builtin/fetch.c: ignore merge config when not fetching from branch's remote

[git.git] / t / t5510-fetch.sh

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 950b7720e35fbc9ccb4170f5f6a43fff0bb7bc4d..6a83771334a774c24b67672abbd17d1d2bdac46b 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -240,7 +240,7 @@ test_expect_success 'fetch with a non-applying branch.<name>.merge' '
        git fetch blub
 '
 
-test_expect_failure 'fetch from GIT URL with a non-applying branch.<name>.merge' '
+test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge' '
        git update-ref -d FETCH_HEAD &&
        git fetch one &&
        git rev-parse --verify FETCH_HEAD