{"thread":{"id":"53683","subject":"Re: Rename offensive terminology (master)","startedAt":"2020-06-15T21:12:30Z","lastAt":"2020-06-15T21:12:30Z","messageCount":1,"participants":["frederik@ofb.net"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"399821","messageId":"20200615210501.GA526224@localhost","threadId":"53683","inReplyTo":null,"subject":"Re: Rename offensive terminology (master)","fromName":"","fromEmail":"frederik@ofb.net","sentAt":"2020-06-15T21:05:01Z","receivedAt":"2020-06-15T21:12:30Z","isPatch":false,"sender":{"key":"frederik@ofb.net","avatar":null},"body":"It sounds like the proposed changes are not going to be very\ndisruptive. However, legitimizing the inherent offensiveness of terms\nlike \"master\" and \"slave\" seems short-sighted to me. Any time that one\nperson has to work for another, a relationship exists which could be\nabused, and the words describing this relationship would gradually\nbecome \"emotionally loaded\". However, computers are full of instances\nwhere one component is doing work for another component. Consider the\nfact that the word \"server\" comes from \"servus\", meaning \"slave\" in\nLatin. While \"master\" comes from \"magis\" meaning \"greater\". Are we\ngoing to be able to eliminate the situations where one part of a\nsoftware system is greater than another part, or accepts commands from\nit?\n\nFurthermore, as someone already pointed out, who on this list speaks\nfor former slaves? I think someone who spoke for former slaves in my\ncountry is the Honorable Elijah Muhammad. His books are full of\nreferences to his teacher \"Master Fard Muhammad\" who came to American\nin 1930 with a message of freedom, justice and equality for the Black\npeople of America. He taught his followers to pray to a God who is\n\"Master of the Day of Judgment\", and to accept a 7th century prophet\nwho is \"slave and messenger of God\". For us to take offense at these\nterms could signify greater racial awareness, or it could betray our\nignorance of the leadership of people, like Elijah Muhammad, who have\nbeen trying to change the system for longer than we have.\n\nIf Git developers are interested in helping disadvantaged members of\nour society, then I would suggest applying my patch from two years\nago, which de-alphabetized git(1), making it readable for novices.\n\n\n\nOn Sun, Jun 14, 2020 at 09:06:18PM +0000, Junio C Hamano wrote:\n>Konstantin Ryabitsev <konstantin@linuxfoundation.org> writes:\n>\n>> - having a branch named \"master\" is already not required, so any\n>>   existing software that expects there to always be a \"master\" branch is\n>>   already broken and wouldn't get any more broken by the move away\n>>   towards more descriptive terminology\n>\n>The above is mostly true but not entirely, I have to remind you.\n>\n>There certainly is the concept of the primary branch in each\n>repository.  With the current version of Git, it is hardcoded to be\n>the 'master' branch, and we are going to make it configurable with a\n>configuration variable [*1*].  There are a few examples that the\n>primary branch is treated specially:\n>\n> - When merging into the primary branch, the auto-generated merge\n>   message is different from a merge into any other branches.  This\n>   was because most of the merges, especially in early days of Git,\n>   were into the primary branch (there weren't many cross-branch\n>   merges made) and we did not want to see repeated \"Merge X into\n>   'master'\", \"Merge Y into 'master'\", etc.---we just say \"Merge X\",\n>   \"Merge Y\", etc. when merging into the primary branch.\n>\n> - \"gitk\" gives preferencial treatment to 'master' when there are\n>   too many references it has to choose which ones to make visible.\n>\n> - \"git fast-export --anonymize\" redacts the name of all the\n>   branches, but the name of the 'master' branch is left intact in\n>   its anonymized output (which is done in order to make the primary\n>   line of work identifiable even in the redacted output stream).\n>\n>There may be others.  Software that assumes that 'master' is special\n>is *not* broken as you stated (we will break them when we allow\n>changing the default---that is the cost those of us who are working\n>on the transition plan thought worth paying).  The concept of \"there\n>is one thing that is special among others\" can serve useful purpose.\n>\n>It of course opens a different can of worms ;-) Even though we can\n>please master-slave-haters by moving away from the particular word\n>'master', those who cannot stand the very idea of one thing being\n>special among others will not be satisfied (and we shouldn't even\n>try to please them, IMO).\n>\n>\n>\n>[Footnote]\n>\n>*1* There is a related but separate concept of the \"default name\"\n>for the primary branch in newly created repositories, which also is\n>hardcoded to be 'master'.  We are going to make it configurable,\n>too.  This controls the name used by \"git init\" (possibly we will\n>also add a command line override \"git init -b name\" to countermand\n>the configured default) and \"git clone\" (which tries to use the\n>name of the branch pointed at by HEAD of the other side but has to\n>fall back to something when it cannot figure it out).\n>\n"}]}