Some users like to set `remote.origin.prune = true` in their ~/.gitconfig so that all of their repositories use that default. However, our code is ill-prepared for this, mistaking that single entry to mean that there is already a remote of the name "origin", even if there is not. This patch adds a test case demonstrating this issue. Reported by Andrew Arnott. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- t/t5505-remote.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 8198d8eb05..d7e41e9230 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -764,6 +764,15 @@ test_expect_success 'rename a remote with name prefix of other remote' ' ) ' +test_expect_failure 'rename succeeds with existing remote.<target>.prune' ' + git clone one four.four && + ( + cd four.four && + git config remote.upstream.prune true && + git remote rename origin upstream + ) +' + cat >remotes_origin <<EOF URL: $(pwd)/one Push: refs/heads/master:refs/heads/upstream -- 2.11.0.windows.3