r/coding • • Jun 14 '20

GitHub to replace "master" with alternative term to avoid slavery references | ZDNet

https://www.zdnet.com/article/github-to-replace-master-with-alternative-term-to-avoid-slavery-references/
430 Upvotes

461 comments sorted by

View all comments

Show parent comments

165

u/mallardtheduck Jun 14 '20

The way the term "master" is used in source control is basically the same as how it's used in the recording industry; it's the definitive, canonical version of the work that can be issued for release. Terms like "main" simply don't describe the same thing.

78

u/pihkal Jun 14 '20

No, the original terminology for this in the 70's/80's was "trunk" (which makes sense given "branches"), not "master". See my comment below about the earlier version control systems, SCCS and RCS for references.

In this case, BitKeeper chose to call it "master" because it had the concept of master and slave repos (see https://mail.gnome.org/archives/desktop-devel-list/2019-May/msg00066.html). When Linus replaced BitKeeper with git on the Linux kernel, he kept the default "master" terminology.

The recording industry concept of a master doesn't apply in git. It's derived from "master/slave" usage.

20

u/dethb0y Jun 15 '20

I think "Trunk" makes more sense semantically to what's actually going on, anyway.

5

u/franz_haller Jun 15 '20

“Trunk” makes sense in subversion because it is logically distinct from all the other “branches”: it’s where all those branches originate from and kept at the top level of the hierarchy. Git’s branching mode is very different. In git, “master” is a branch like any other, just happens to be the default one that is created. And that default can be whatever you want, I’ve seen people call it “development” to convey that it’s where the current work is happening and it’s not stable.

1

u/Tagedieb Jun 17 '20

I don't think what you say about svn is true. Any folder in svn can be a branch or just a normal folder. And any folder can be 'copied', where the copy is automatically considered a branch of the source folder. Any folder can be checked out and committed to.

23

u/drawkbox Jun 14 '20

SVN/Subversion still uses "trunk" as the main base branch/source.

In Mercurial, came out around the same time as git, the root branch is "default".

19

u/iczero4 Jun 14 '20

BitKeeper is almost completely a historical footnote at this point. I do not know anyone who still actively uses it. True, it may be unfortunate that BitKeeper decided to use the master/slave terminology, however, git does not use the term in the same way. git lacks "slave repositories" and afaict does not use the "slave" terminology anywhere. It isn't a direct successor to BitKeeper either, it simply adopted some of its concepts.

The recording industry concept of a master does apply in git. In fact, that's almost exactly how it is used most of the time. What it derives from is irrelevant. Meanings of words change over time.

0

u/Esseratecades Jun 15 '20

afaict

Acronyms are getting out of hand...

11

u/Jestar342 Jun 15 '20

afaict => as far as I can tell

That's actually one of the oldest initialisms on the internet.

2

u/ItzWarty Jun 16 '20

This is wrong according to the person who committed "master" to git.

Out of curiosity, why 'master'? What was it meant to convey? 'Master' as in 'original' or as in 'owner'?

"master" as in e.g. "master recording". Perhaps you could say the original, but viewed from the production process perspective.

https://twitter.com/xpasky/status/1272280760280637441

13

u/FruityWelsh Jun 14 '20

tbh in this case the "primary/replica" makes so much more sense to me. If that was the terminology when I first learned the "master/slave" dichotomy I would have immediately understood what the relationship was.

0

u/[deleted] Jun 15 '20

[deleted]

2

u/FruityWelsh Jun 15 '20

And to be honest, it doesn't really make sense in that industry!

5

u/poolpartyziggyziggs Jun 15 '20

In the realm of slaving digital equipment to a single master clock, yes, it does. Given that, I'm open for alternatives for the audio industry.

0

u/[deleted] Jun 15 '20

[deleted]

1

u/poolpartyziggyziggs Jun 15 '20

Are you saying that digital audio doesn't have a master/slave sync status? I know what a master recording is. There is also a mastering process that finishes the record.

0

u/[deleted] Jun 15 '20

[deleted]

1

u/poolpartyziggyziggs Jun 15 '20

With respect, midi doesn't require wordclock. What I'm referring to is something that is actively referred to as "master/slave" relationship. A master recording may be more comparable to a master branch in a repo, but as an audio engineer that dabbles in code, I feel if we're pointing out things like this, digital clocking is much more appropos (I think I used that word right).

I'll be straight with you, I think we're on the same page and I'm just a little inebriated lol. And if you're not in the audio industry there is no reason to know what I've been referring to lol.

1

u/FruityWelsh Jun 15 '20

source clock / synced device?

otherwise for digital timing I know everything in terms of stratums

2

u/poolpartyziggyziggs Jun 15 '20

I am referring to word clock or smpte. I'm not familiar with stratums. SyncPrimary and SyncRedundant or similar would work as alternative titles.

1

u/alex-manool Jun 15 '20 edited Jun 15 '20

Even if we talk about the old IDE interface master/slave terminology, this does not change much. Many contemporary words just have their history, which does not make them bad (and anyway forgetting history leads to repetition). Otherwise, with the same success we should forbid the term "Slavic people" or "Slavic languages" because they have the same relation with Afroamerican people as IDE's master/slave.

2

u/mallardtheduck Jun 15 '20

As an aside: PATA IDE is probably not the best example for a historical use of "master/slave" terminology, because the two devices on one IDE channel are actually completely equal; there's just one bit in a register that selects which drive is "current". I suspect the term was simply used because primary/secondary already had a meaning in the context and something like A/B would cause confusion with common OSs that have "drive letters".

Honestly, I suspect the use of "master/slave" terminology in computing contexts has more to do with BDSM than actual slavery (the stereotype of male "computer nerds" being unpopular with women and overly interested in pornography and such probably has some kernel of historical truth; porn was being spread through BBSs and the like long before the internet made it "mainstream"), but that's a whole different discussion...

0

u/[deleted] Jun 15 '20

[deleted]

→ More replies (13)