{"thread":{"id":"9916","subject":"[PATCH 2/5] Don't attempt to merge non-existant remotes in t5515","startedAt":"2007-09-18T08:54:51Z","lastAt":"2007-09-18T08:54:51Z","messageCount":1,"participants":["Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"53422","messageId":"20070918085451.GB5390@spearce.org","threadId":"9916","inReplyTo":null,"subject":"[PATCH 2/5] Don't attempt to merge non-existant remotes in t5515","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-09-18T08:54:51Z","receivedAt":"2007-09-18T08:54:51Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"This was actually reverted in 756373da by Junio.  We no longer\nsupport merging the right hand side of a fetchspec in a branch's\nbranch.$name.merge configuration setting as we interpret these\nnames as being only those published by the remote we are going to\nfetch from.\n\nThe older shell based implementation of git-fetch did not report an\nerror when branch.$name.merge was referencing a branch that does\nnot exist on the remote and we are running `git fetch` for the\ncurrent branch.  The new builtin-fetch does notice this failure\nand aborts the fetch, thus breaking the tests.\n\nJunio and I kicked it around on #git earlier today and decided that\nthe best approach here is to error out and tell the user that their\nconfiguration is wrong, as this is likely more user friendly than\nsilently ignoring the user's request.  Since the new builtin-fetch\nis already issuing the error there is no code change required, we\njust need to remove the bad configuration from our test.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n t/t5515-fetch-merge-logic.sh |    3 +--\n 1 files changed, 1 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh\nindex 6c9cc67..31c1081 100755\n--- a/t/t5515-fetch-merge-logic.sh\n+++ b/t/t5515-fetch-merge-logic.sh\n@@ -84,8 +84,7 @@ test_expect_success setup '\n \t\tgit config branch.br-$remote-merge.merge refs/heads/three &&\n \t\tgit config branch.br-$remote-octopus.remote $remote &&\n \t\tgit config branch.br-$remote-octopus.merge refs/heads/one &&\n-\t\tgit config --add branch.br-$remote-octopus.merge two &&\n-\t\tgit config --add branch.br-$remote-octopus.merge remotes/rem/three\n+\t\tgit config --add branch.br-$remote-octopus.merge two\n \tdone\n '\n \n-- \n1.5.3.1.1000.g7319b\n"}]}