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 22398 invoked from network); 9 Jan 2022 01:46:11 -0000 Received: from lists.zx2c4.com (165.227.139.114) by inbox.vuxu.org with ESMTPUTF8; 9 Jan 2022 01:46:11 -0000 Received: by lists.zx2c4.com (OpenSMTPD) with ESMTP id d0165ff0; Sun, 9 Jan 2022 01:45:59 +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 8706e084 (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO) for ; Sun, 9 Jan 2022 01:45:58 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1641692755; cv=none; d=zohomail.com; s=zohoarc; b=NgzEnfCnAw29SyCKQSxELiUnOJSZBmZLZpo/jiMMsQ+PNuLTo98UPhFkD0ydtyjBq8IJzuZyEcpg+xLwhsHTNSsQZAnIJJYPUWOB8edQN4s0B6G5WUlyhhNOmhX2nUFro0c13Q8R/ImUNQfsg+vY2sBCOkkOzQfaQfgTGlbtH1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641692755; h=Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=A70F9zvyjXcfBv3ewIlIA40m6K95dQWLT0yKntJb8ZM=; b=FBp16fzEeJPsDfc6DkEH2wC0wRZbaRoaI5cfLDCTRxg0k13tqtuQbbhDNZY9mMUrlkti6oNnZVMPPzNt7mq98FX3ODw1d1PovW5tMYvwr3xDmIU0IEKF7dqnwdMOiqKTd+wW5CzjfIWAyTZeHoBYfOpw8brfvRKVeDmWmiLENI4= 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=1641692755; s=zoho; d=nilfm.cc; i=nilix@nilfm.cc; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Transfer-Encoding; bh=A70F9zvyjXcfBv3ewIlIA40m6K95dQWLT0yKntJb8ZM=; b=M76tuDxrWBO+CiiTYpnNB5tT8jdOSVeYdrWmBfXo1ND5NAnsZW+pvVbTL1G6OEJW rzfMCgrURKSkwJQ8AsEkbHAQgttnMAk3HcWOaeo+RK9lKc3UJYqrx6SHYKHpZfpgVcN cjIygwwQ0xksZ47QDy84iYkqBiLmzv4qng/2zrBM= Received: from ksatrya.hsd1.nm.comcast.net (c-76-127-49-136.hsd1.nm.comcast.net [76.127.49.136]) by mx.zohomail.com with SMTPS id 1641692754765980.2768502582481; Sat, 8 Jan 2022 17:45:54 -0800 (PST) From: Derek Stevens To: cgit@lists.zx2c4.com Cc: Derek Stevens Subject: [PATCH] use main as default branch instead of master Date: Sat, 8 Jan 2022 18:45:45 -0700 Message-Id: <20220109014545.17815-1-nilix@nilfm.cc> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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" Signed-off-by: Derek Stevens --- cgit.c | 2 +- cgitrc.5.txt | 2 +- ui-repolist.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cgit.c b/cgit.c index 08d81a1..5b0a016 100644 --- a/cgit.c +++ b/cgit.c @@ -489,7 +489,7 @@ static char *guess_defbranch(void) ref = resolve_ref_unsafe("HEAD", 0, &oid, NULL); if (!ref || !skip_prefix(ref, "refs/heads/", &refname)) - return "master"; + return "main"; return xstrdup(refname); } diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 33a6a8c..9639156 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -479,7 +479,7 @@ repo.defbranch:: The name of the default branch for this repository. If no such branch exists in the repository, the first branch name (when sorted) is used as default instead. Default value: branch pointed to by HEAD, or - "master" if there is no suitable HEAD. + "main" if there is no suitable HEAD. repo.desc:: The value to show as repository description. Default value: none. diff --git a/ui-repolist.c b/ui-repolist.c index 529a203..c162290 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -53,7 +53,7 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime) strbuf_reset(&path); strbuf_addf(&path, "%s/refs/heads/%s", repo->path, - repo->defbranch ? repo->defbranch : "master"); + repo->defbranch ? repo->defbranch : "main"); if (stat(path.buf, &s) == 0) { *mtime = s.st_mtime; r->mtime = *mtime; -- 2.34.1