* [PATCH] use main as fallback branch instead of master
@ 2022-01-08 23:56 Derek Stevens
2022-01-09 0:55 ` René Neumann
0 siblings, 1 reply; 3+ messages in thread
From: Derek Stevens @ 2022-01-08 23:56 UTC (permalink / raw)
To: cgit; +Cc: Derek Stevens
Signed-off-by: Derek Stevens <nilix@nilfm.cc>
---
ui-repolist.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] use main as fallback branch instead of master
2022-01-08 23:56 [PATCH] use main as fallback branch instead of master Derek Stevens
@ 2022-01-09 0:55 ` René Neumann
2022-01-09 1:45 ` Derek Stevens
0 siblings, 1 reply; 3+ messages in thread
From: René Neumann @ 2022-01-09 0:55 UTC (permalink / raw)
To: Derek Stevens, cgit
Am 09.01.22 um 00:56 schrieb Derek Stevens:
> Signed-off-by: Derek Stevens <nilix@nilfm.cc>
> ---
> ui-repolist.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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;
1. This change itself seems rather meaningless. There is at least one
other occurrence in cgit.c#guess_defbranch(), which must be in sync.
2. Also change the man file.
- René
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] use main as fallback branch instead of master
2022-01-09 0:55 ` René Neumann
@ 2022-01-09 1:45 ` Derek Stevens
0 siblings, 0 replies; 3+ messages in thread
From: Derek Stevens @ 2022-01-09 1:45 UTC (permalink / raw)
To: René Neumann; +Cc: cgit
[-- Attachment #1: Type: text/plain, Size: 1125 bytes --]
Ah yes, point taken; My apologies for not being thorough! I am submitting a more complete one momentarily :)
Thanks,
Derek
------original message------
From: René Neumann <lists@necoro.eu>
Date: Sat, Jan 08, 2022 at 05:55:25PM MST
>
>Am 09.01.22 um 00:56 schrieb Derek Stevens:
>>Signed-off-by: Derek Stevens <nilix@nilfm.cc>
>>---
>> ui-repolist.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>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;
>
>1. This change itself seems rather meaningless. There is at least one
>other occurrence in cgit.c#guess_defbranch(), which must be in sync.
>2. Also change the man file.
>
>- René
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-09 1:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-08 23:56 [PATCH] use main as fallback branch instead of master Derek Stevens
2022-01-09 0:55 ` René Neumann
2022-01-09 1:45 ` Derek Stevens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).