From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 7079 invoked from network); 9 Jan 2022 17:23:07 -0000 Received: from lists.zx2c4.com (165.227.139.114) by inbox.vuxu.org with ESMTPUTF8; 9 Jan 2022 17:23:07 -0000 Received: by lists.zx2c4.com (OpenSMTPD) with ESMTP id 74d97a5e; Sun, 9 Jan 2022 17:22:55 +0000 (UTC) Return-Path: Received: from sender4-op-o11.zoho.com (sender4-op-o11.zoho.com [136.143.188.11]) by lists.zx2c4.com (OpenSMTPD) with ESMTPS id 9fd35516 (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO) for ; Sun, 9 Jan 2022 17:22:54 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1641748970; cv=none; d=zohomail.com; s=zohoarc; b=JJPz0nI4q1960DxC1GmLllL/I5JppB1mib8BIgsHjGYH6o8eGXr7wM6So5TBZruOAt4dEuoPPsvmOe+48pAuQ3+Ws6IOY40WMw8BJhsrbWWAImui4ESd2wfi+w+hP5+Byp5+RawWHwUsPJ0dc/1kk68ARVOh3Dn5z1PrZLndkTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641748970; h=Content-Type:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=JDgxJU1A4G//7WvcJloW79jql0tL+VD0qph1SUPAk3I=; b=GgTD2UvmCzafb+QP2WL8I8vvQxluL1rkeg63cZcardTQgMwcRoUpiXJKO/G452nt0KcrhHH4ZSuTJ1qmoZLScfrL8SG3RYc9UKdje2e031dRrs0C8AghfxibQM5A2ujWG8kBbn8h0xUZYmRolyYYLcPlCeq3AHVrfUwM99/nh5A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=nilfm.cc; spf=pass smtp.mailfrom=nilix@nilfm.cc; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1641748970; s=zoho; d=nilfm.cc; i=nilix@nilfm.cc; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:Content-Type:In-Reply-To; bh=JDgxJU1A4G//7WvcJloW79jql0tL+VD0qph1SUPAk3I=; b=SjVT6V6YRq6ctxSbfwb8MLvHm0YAM5/jO8kC7gBE7h9ACi7fweQs7ybZUQ5H+saG T6xAwbvwS0X0zY415TBQ29IyXcTCW6R0FVH1A8EiH7LnZYZrBHamqyizyzSXmveCfgr 9Gta+iOIgv17UGC3gI6ut/Nqfh/D6q/AsLpWhAW4= Received: from ksatrya.siroonian.local (c-76-127-49-136.hsd1.nm.comcast.net [76.127.49.136]) by mx.zohomail.com with SMTPS id 1641748969430580.8357747414225; Sun, 9 Jan 2022 09:22:49 -0800 (PST) Date: Sun, 9 Jan 2022 10:22:48 -0700 From: Derek Stevens To: Jan =?utf-8?Q?Dr=C3=B6gehoff?= Cc: cgit@lists.zx2c4.com Subject: Re: [PATCH] use main as default branch instead of master Message-ID: <20220109172248.4erpxsldpuyeycpy@ksatrya.siroonian.local> References: <20220109014545.17815-1-nilix@nilfm.cc> <20220109030454.r2gxxox4hzz5uf6g@feather> <817460f2-2e3a-a385-76c4-685ce2c92700@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="25hvhhkxockomjnv" Content-Disposition: inline In-Reply-To: <817460f2-2e3a-a385-76c4-685ce2c92700@gmail.com> X-Zoho-Virus-Status: 1 X-BeenThere: cgit@lists.zx2c4.com X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: List for cgit developers and users List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: cgit-bounces@lists.zx2c4.com Sender: "CGit" --25hvhhkxockomjnv Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable OK, no worries there. I'm fine leaving it alone as well. Cheers, Derek ------original message------ =46rom: Jan Dr=F6gehoff Date: Sun, Jan 09, 2022 at 05:53:22AM MST >>Replacing one hard coded value with another is really not helpful. >>Git itself solves this locally with init.defaultBranch in its config. >> >>If the corresponding option is unset you are helpfully told to choose >>one. That is however not simply a matter of s/master/main/ but the >>following: >> >>>Names commonly chosen instead of 'master' are 'main', 'trunk' and >>>'development'. >>As you can see, multiple "common" options. > >At the moment I think its better to simply stay with 'master' since=20 >that is what Git uses as the default at the moment > >even if multiple git hosting sites have decided to adopt main > >>There's work ongoing in git to make this more streamlined, >>last example I know being >> >> commit e06c9e1df28e04bbf013840c6c50ce1be41b9583 >> Author: Thomas Wei=DFschuh >> Date: Wed Nov 3 21:17:02 2021 +0100 >> >> var: add GIT_DEFAULT_BRANCH variable. >> >>There's also similar efforts that would allow querying a remote. >> >>So I'd suggest you wait for upstream to figure it out first, rather than >>blindly substituting the term which would break existing setup for no >>real reason. --25hvhhkxockomjnv Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEkFh6dA+k/6CXFXU4O3+8IhROY5gFAmHbGeYACgkQO3+8IhRO Y5j+CxAAiAL0XIltQvVB3PhsUGG31tfqYfNZyv64JrrIcVGd5E9FnCvtsJuaCrqk k0x8k9geiauELfkGP0yRlweXlM6TwDkCUQrZ0xK6JLsVymtG0AGlbgfkjBuMAYib nGnJYpvKKT/gT5kG8NpjACxJLe5y4WmYoyjqJI4kRvaAos+bdwMG/zq/2jZbv3pL p+unbyqZXtPeBe9BLaNQxcU3gt/IZYws1vk0mWBuqAv2HTGVgb2r1UGi6WAZ4Asn RqCL1sh5nTSbIUlY+K1dfty2IsMq7Q4D75nXz59b9Wf4gNYXHog4Q55/oNAkepf0 gGY1heq62tJE21h2xiWGuf0O9w2HlkqGqC/wXGnM6KTNJdM2e2TNQfdbXgSmM90v ZHG8HKN6XRPomBct78FUygRChdBUEqFFzmDl482I5WqnagUdwmVkObsYt1RSNnNk DR/w0djjQXt8xKTHc7vrNaERnl8EnNyqMw+6RlfCFYaMkGMys878PH8IJklhvj+p sQZlnXn3ukOv8wv/ZcAtMovzXi5u9bKrf0teaR4n1KqwC/Tg8IXgNl3NgVMlTo7p GU9ueJASxxFgsvHsetWtdNVOj43/lZILbXDfgFd2UW9L0O+pZgTGVjCsIQ4g4Fpl i6KbicHZFC7YkkFGGhnDtiwyPAtK4/2UJWpk+GtBoQ7qKFOYpSw= =d597 -----END PGP SIGNATURE----- --25hvhhkxockomjnv--