Post 9w0fKAMryBg0yyKZaS by ndegruchy@fosstodon.org
(DIR) More posts by ndegruchy@fosstodon.org
(DIR) Post #9w0dTBQxB014zCPfhQ by emacsen@emacsen.net
2020-06-12T14:16:37Z
0 likes, 0 repeats
Git's "master" branch is hard coded into the software, though you can use a template to override the behavior:https://superuser.com/questions/1419613/change-git-init-default-branch-nameLuckily, once the branch has been committed to, you can move it to something else with:git branch -m master mainas perhttps://www.hanselman.com/blog/EasilyRenameYourGitDefaultBranchFromMasterToMain.aspxI hope that Git changes its defaults soon.
(DIR) Post #9w0epWvw1OmLzW7kSO by ndegruchy@fosstodon.org
2020-06-12T14:31:50Z
0 likes, 0 repeats
@emacsen Is this a problem in git? I mean, it’d be nice to customize, and it looks like you can, but not something people really worry about.
(DIR) Post #9w0f30jmWRnIBurqa0 by emacsen@emacsen.net
2020-06-12T14:34:18Z
0 likes, 0 repeats
@ndegruchy Is it a problem that branches have names like master? Yes, absolutely!
(DIR) Post #9w0fKAMryBg0yyKZaS by ndegruchy@fosstodon.org
2020-06-12T14:37:23Z
0 likes, 0 repeats
@emacsen in what way? It signifies that this branch is the default or “master” branch that should be coded against. I don’t think it has any slavery connotations, nor do I think we need to inspect every last string and tear out words that might, in specific contexts, be construed as being related to slavery.
(DIR) Post #9w0invlX7mmiFDkeiu by emacsen@emacsen.net
2020-06-12T15:16:24Z
0 likes, 0 repeats
@ndegruchy It's a term that causes harm.Let me give you an example from my own life. In several Sign Languages, there are many anti-semetic signs. Signs for Jewish are anti-semetic, signs for "greedy" imply Jewish stereotypes, etc.You may say "Well so what? Who cares?" but such experiences take an emotional, and even (as science has shown) physical toll on a person.Terms like this are part of the kind of injustice that I work so hard to fight against, and Free Software should be part of.
(DIR) Post #9w0oIOq06DxMrtBmqm by m455@tiny.tilde.website
2020-06-12T16:17:53Z
0 likes, 0 repeats
@emacsen i just changed all of my master branches to main on my major projects just now :D
(DIR) Post #9w0rFnSmNypaEimIqW by feld@bikeshed.party
2020-06-12T16:51:04.564588Z
1 likes, 0 repeats
@emacsen there isn't a single mention of "slave" in the git source code outside the test suitegrep -R slave ../t/test-terminal.perl:$master_in->slave->set_raw();./t/test-terminal.perl:$master_out->slave->set_raw();./t/test-terminal.perl:$master_err->slave->set_raw();./t/test-terminal.perl:my $pid = start_child(\@ARGV, $master_in->slave, $master_out->slave, $master_err->slave);./t/test-terminal.perl:close $master_in->slave;./t/test-terminal.perl:close $master_out->slave;./t/test-terminal.perl:close $master_err->slave;./t/t4014-format-patch.sh:git checkout -b slave master &&./t/t4014-format-patch.sh:git merge --no-ff slave &&
(DIR) Post #9w0rLqkp3x5ABH6VX6 by rage@fosstodon.org
2020-06-12T16:51:48Z
0 likes, 0 repeats
@emacsen why?
(DIR) Post #9w0rVwU8bth6qo71RA by duponin@udongein.xyz
2020-06-12T16:53:58.807800Z
0 likes, 0 repeats
@feld @emacsen about master/slave, what about movie’s master film?
(DIR) Post #9w0rhF9pWiyJwp0Cbg by zigg@queer.garden
2020-06-12T16:56:00Z
0 likes, 0 repeats
@emacsen Didn't expect to learn something in the comments on that article.https://twitter.com/tobie/status/1270290278029631489Summary: Git's use of the word "master" was actually rooted in "master/slave", even though many folks (including me) thought it merely meant something like "master copy".(Of course, that's no reason not to change it, but it's a good illustration of how deep this sort of thing runs.)
(DIR) Post #9w0riBa4JKQH8ziyYa by emacsen@emacsen.net
2020-06-12T16:56:09Z
0 likes, 0 repeats
@duponin @feld How is that a descriptive description of a film?Maybe "Clean copy" "Original" "Release", etc?
(DIR) Post #9w0rprxx7cMIcuYls0 by duponin@udongein.xyz
2020-06-12T16:57:36.107450Z
0 likes, 0 repeats
@emacsen @feld a master is the published version of a movie/songIt explains the remaster term (≠ remix)
(DIR) Post #9w0rv3dX9rLuGpU0kS by feld@bikeshed.party
2020-06-12T16:58:32.083486Z
0 likes, 0 repeats
@duponin @emacsen audio mastering is now a crime
(DIR) Post #9w0s6UH2ShdM4NPYcS by emacsen@emacsen.net
2020-06-12T17:00:35Z
0 likes, 0 repeats
@duponin Then you've already come out with a good replacement term "Published".If you want to replace remastered- that term is again ambigious, so how about "refreshed", "recomposed', "cleaned"
(DIR) Post #9w0tc1dCac1iSPNdlg by rune@mastodon.nzoss.nz
2020-06-12T17:12:07Z
0 likes, 0 repeats
@feld @emacsen @duponin apprenticeships in blacksmithing has also gotten very confusing because the master now describes themselves as "leader blocksmith" instead of "master blacksmith"
(DIR) Post #9w0tc3WBZfbQJE746q by rune@mastodon.nzoss.nz
2020-06-12T17:13:38Z
0 likes, 0 repeats
@feld @emacsen @duponin and we had to get rid of all our blackboards and whiteboards and replace them with regular boards.
(DIR) Post #9w0tc7gc4qJvEj1Ruy by feld@bikeshed.party
2020-06-12T17:17:20.568069Z
0 likes, 1 repeats
@rune @emacsen @duponin waiting with bated breath for a petition from Liberal Arts students to change the Spanish language so the color black isn't called "negro".
(DIR) Post #9w184f8sgHZASskObw by dozens@tiny.tilde.website
2020-06-12T19:58:52Z
0 likes, 0 repeats
@emacsen you inspired me to change my defaults and share them.https://github.com/chrisman/kill-your-masters
(DIR) Post #9w1CJLJH6Cjj7GresK by feoh@cybre.space
2020-06-12T20:46:59Z
0 likes, 0 repeats
@emacsen There's an interesting bit of nuance lost in changing master to main. (NOTE I AM NOT DEFENDING MASTER!)master denotes not just the root of the tree, but the ultimate source of truth for a given piece of source code.Not sure if that matters, this just occurred :)(My cloudy overlords use 'mainline' FWIW which is at least better)
(DIR) Post #9w1CWzXMqWghdxxrIO by emacsen@emacsen.net
2020-06-12T20:49:29Z
0 likes, 0 repeats
@feoh This is a good discussion topic, so lets discuss it.First, if mainline suits you, use it!I think "mainline" is longer than main by a factor of 2 and has the same meaning.But if you are looking at it as a tree structure (rather than a graph), then you could indeed call it root, or base.Heck call it the "truth" branch if it's the source of truth.All of these are already more descriptive and not wrapped up in racism.
(DIR) Post #9w1ftFhQKjnAoMdRJI by feoh@cybre.space
2020-06-13T02:18:26Z
0 likes, 0 repeats
@emacsen I totally agree, and I'll admit I'm making distinctions around whether your car is painted orange or burnt umber. I like 'root' or 'truth' I just feel like 'main' implies a whole lot that doesn't have to do with its functional role. Maybe I just need to zoom out a bit and mull it over :) (I don't particularly love 'mainline' either, although I do like that it implies a railroad or subway system with this being the primary path from which others diverge.)
(DIR) Post #9w1g6naNejGtflnfxA by feoh@cybre.space
2020-06-13T02:20:53Z
0 likes, 0 repeats
@emacsen This is also an interesting case of implicit bias because I've been hearing, reading and learning about 'master' and 'slave' as concepts in computer science for the last 40 years so it actually took me a bit to de-subjectify the terms and understand their racist root.
(DIR) Post #9w2qdVpjOKE9CvtVOS by mathew@mastodon.social
2020-06-13T15:53:32Z
0 likes, 0 repeats
@emacsen Quick script to update your existing Github repos:https://gist.github.com/lpar/c74f661a17d52b942bfb8b1fd1496972