From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id BDD8F1F5AE for ; Wed, 29 Jul 2020 19:45:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726710AbgG2TpO (ORCPT ); Wed, 29 Jul 2020 15:45:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726365AbgG2TpO (ORCPT ); Wed, 29 Jul 2020 15:45:14 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E744BC061794 for ; Wed, 29 Jul 2020 12:45:13 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id q7so26359441ljm.1 for ; Wed, 29 Jul 2020 12:45:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:from:date:message-id:subject:to:cc; bh=hZayYGqdabUcEOOrGc9wNwF/Ij3PuDS3VRuTkhuYxcs=; b=QlzMR3mpluHyDcz8miSxki0O56wK4Is99pvuWzyQjEh9qh7AavPu8fqWAY/sokdqUT /R/MwQ+MQTl+UvOu3npXv7gYkg08DD0jvZJMnSg1vv85OFWpK8QFEhFmiAJ9sJzm3H9P 5uyo/VlfIUtttddjnHFoHaQykioNvXslk9Hqc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=hZayYGqdabUcEOOrGc9wNwF/Ij3PuDS3VRuTkhuYxcs=; b=okhVv0ElPj5BHtSBSsHtqyixLmkH6XXlPvRw4Qf0FJ8wXiXDpc4BYxVl5zYWIn5gdE VQjXpXYIWacxNNOyMrqeUqGrnOCAQUukewznKwhIDy3Wg8y5siDzCvYV8TjUzy8nJfiG eIjYUOtagdikXu2PgIr1OuR1kGs1iYwbU/70wjpFUUPxReS/fv0JP6Yoi4bfqdzbOxJM qkpgw2jL0z3PiHgYYPH8AmcuaGe+nrU4zo2rMKAowiY/C7rRtyeH8+1kka/kN0xCHP3B InZryJHmSzwjplIOnTOzNPcWpYYqjvBNK+1KwU9q34aoQbMBFD5SYeCj8Wm2CD5Nv6UP w5oA== X-Gm-Message-State: AOAM533l7X8h+NJGhQIbeQz/cuhxjwC4ako/Mc6sqTWxMcZa07VNNTW0 KM3ejUvpli07Scz8ejnvwZSk3UTwii4= X-Google-Smtp-Source: ABdhPJy7kTSOUIDzX9S3Icd342hFHK90vFDcqgiByG1QW6+4TRhictKhiSSBcw93eg6ZLU7FACDYdg== X-Received: by 2002:a2e:9bc1:: with SMTP id w1mr21696ljj.288.1596051911374; Wed, 29 Jul 2020 12:45:11 -0700 (PDT) Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com. [209.85.167.45]) by smtp.gmail.com with ESMTPSA id b18sm800132lfp.36.2020.07.29.12.45.10 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Jul 2020 12:45:10 -0700 (PDT) Received: by mail-lf1-f45.google.com with SMTP id b11so13698721lfe.10 for ; Wed, 29 Jul 2020 12:45:10 -0700 (PDT) X-Received: by 2002:a19:408d:: with SMTP id n135mr8641583lfa.192.1596051910327; Wed, 29 Jul 2020 12:45:10 -0700 (PDT) MIME-Version: 1.0 From: Linus Torvalds Date: Wed, 29 Jul 2020 12:44:54 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Avoiding 'master' nomenclature To: Junio Hamano C , Johannes Schindelin Cc: Git List Mailing Content-Type: text/plain; charset="UTF-8" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org It turns out that commit 489947cee5 ("fmt-merge-msg: stop treating `master` specially") has the exact opposite effect of what the intention must have been. It may remove "master" from git, but what it does is then make it much more visible everywhere else. In fact, it doesn't even remove "master" from git itself. It just adds more of it into the test suite etc. So that commit is doubly stupid. If the intent was to try to avoid "master" as a word, it failed on every single possible level. The code that it removed was the code that actively _avoided_ using "master" naming, for chrissake. Linus