For our mainline development branch, I am also fine with following the lead of the "upstream" git community on this decision. I have seen "develop" used in a number of places, which I like, but I also have no concerns with "main".
For the test-patch default, maybe we omit a default value going forward and require the user always provide it. For that matter, if we make this value available as an environment variable, a project can specify it's default branch name via personality file. Thanks, Nick On Tue, Jun 16, 2020 at 8:15 PM Sean Busbey <bus...@apache.org> wrote: > I'd be glad for us to change both our default for development and the > default we use for test-patch. > > To minimize the learning curve for new contributors I'd say we should > go with whatever GitHub changes the default to. I haven't seen > anything on the main github site, but the article you linked (and a > couple others I've seen) suggests "main" ? > > On Mon, Jun 15, 2020 at 1:14 AM Allen Wittenauer > <a...@effectivemachines.com.invalid> wrote: > > > > Hey gang. > > > > I'm sure by now you've all seen news articles like these: > > > > - > https://www.theregister.com/2020/06/15/github_replaces_master_with_main/ > > - > https://arstechnica.com/tech-policy/2020/06/openzfs-removed-master-slave-terminology-from-its-codebase/ > > > > ... as well as the various other conversations happening in the industry > and on Apache mailing lists. > > > > A quick pass through the source tree says we are mostly clean of such > language from parts that originate here. Our biggest trouble spot I > believe is our usage of 'master' in the form of a git master. I think as a > community we have a handful of decisions to make. > > > > a) Should we change our 'master' to something else? > > > > b) If yes, what do we change it to? > > > > c) Do we change the default test-patch branch default from master to > something else as well? > > > > I'd like to have some discussion on what people are thinking in regards > to the above questions. > > > > Thanks. > > > > -- > Sean >
