Merge branch 'jk/grep-no-index-fix' into maint

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index f558ad0b39362255ceec67ef219edc91230d0ec3..3ea27107c2ddee8217d5d91c4b13d85d81b44a5e 100755 (executable)
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -783,6 +783,13 @@ test_expect_success 'rename a remote with name prefix of other remote' '
        )
 '
 
+test_expect_success 'rename succeeds with existing remote.<target>.prune' '
+       git clone one four.four &&
+       test_when_finished git config --global --unset remote.upstream.prune &&
+       git config --global remote.upstream.prune true &&
+       git -C four.four remote rename origin upstream
+'
+
 cat >remotes_origin <<EOF
 URL: $(pwd)/one
 Push: refs/heads/master:refs/heads/upstream