From: Junio C Hamano <gitster@pobox.com>
To: Andy Koppe <andy.koppe@gmail.com>
Cc: Glen Choo <chooglen@google.com>, git@vger.kernel.org
Subject: Re: [PATCH v2] pretty: add %(decorate[:<options>]) format
Date: Tue, 15 Aug 2023 12:01:11 -0700 [thread overview]
Message-ID: <xmqq350kjfk8.fsf@gitster.g> (raw)
In-Reply-To: <006574bd-4d53-495e-8cfe-677ede521908@gmail.com> (Andy Koppe's message of "Tue, 15 Aug 2023 19:28:48 +0100")
Andy Koppe <andy.koppe@gmail.com> writes:
> On 15/08/2023 19:13, Junio C Hamano wrote:
>> If there is 'main' that is different from 'master', that sounds like
>> a problem to me. This project predates the newer convention that
>> allows the primary branch to be named 'main', but many new folks of
>> course expect to see 'main', so while my primary working areas all
>> call the primary branch 'master', it is pushed out to both names.
>> Or at least I thought I arranged that to happen.
>
> See [1], where main currently is at v2.41.0.
>
> Regards,
> Andy
>
> [1] https://github.com/git/git/tree/main
Ah, that one. The CI job is unfortunately attached to that tree and
updating 'master' and 'main' with the same commit at the same time
wastes CI cycles, so I had to tentatively stop updating it.
It used to be that 'main' was set to lag behind 'master' by 24 hours
or so to prevent the problem---CI notices that the commit updated
'main' has been already dealt with 24 hours ago at 'master' and
refrains from wasting time on it. But resurrecting it would still
make folks confused about how 'main' is different from 'master'.
Perhaps it is a good time to remove stale 'main' and keep only
'master' there?
next prev parent reply other threads:[~2023-08-15 19:03 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-15 10:37 [PATCH] pretty: add %(decorate[:<options>]) format Andy Koppe
2023-07-15 16:07 ` [PATCH v2] " Andy Koppe
2023-07-17 23:10 ` Junio C Hamano
2023-07-18 1:05 ` Junio C Hamano
2023-08-11 18:50 ` Andy Koppe
2023-07-19 18:16 ` Glen Choo
2023-07-23 16:25 ` Phillip Wood
2023-08-11 19:04 ` Andy Koppe
2023-08-11 20:38 ` Junio C Hamano
2023-08-11 22:06 ` Andy Koppe
2023-08-12 1:16 ` Junio C Hamano
2023-08-11 18:59 ` Andy Koppe
2023-08-15 18:13 ` Junio C Hamano
2023-08-15 18:28 ` Andy Koppe
2023-08-15 19:01 ` Junio C Hamano [this message]
2023-08-15 19:29 ` main != master at github.com/git/git Andy Koppe
2023-08-15 22:16 ` Taylor Blau
2023-08-16 2:24 ` Jeff King
2023-08-16 13:30 ` rsbecker
2023-08-18 0:35 ` Junio C Hamano
2023-08-21 14:56 ` Johannes Schindelin
2023-08-21 16:17 ` Junio C Hamano
2023-08-22 0:31 ` [PATCH] ci: avoid building from the same commit in parallel Junio C Hamano
2023-08-22 4:36 ` Junio C Hamano
2023-08-22 4:48 ` Johannes Schindelin
2023-08-22 15:31 ` Junio C Hamano
2023-08-23 8:42 ` Johannes Schindelin
2023-08-23 16:08 ` Junio C Hamano
2023-08-23 16:10 ` Junio C Hamano
2023-08-25 12:56 ` Johannes Schindelin
2023-08-10 21:16 ` [PATCH v3 1/7] pretty-formats: define "literal formatting code" Andy Koppe
2023-08-10 21:16 ` [PATCH v3 2/7] pretty-formats: enclose options in angle brackets Andy Koppe
2023-08-10 21:16 ` [PATCH v3 3/7] decorate: refactor format_decorations() Andy Koppe
2023-08-10 21:16 ` [PATCH v3 4/7] decorate: avoid some unnecessary color overhead Andy Koppe
2023-08-10 21:16 ` [PATCH v3 5/7] decorate: color each token separately Andy Koppe
2023-08-10 21:16 ` [PATCH v3 6/7] pretty: add %(decorate[:<options>]) format Andy Koppe
2023-08-10 21:16 ` [PATCH v3 7/7] pretty: add pointer and tag options to %(decorate) Andy Koppe
2023-08-16 4:23 ` [PATCH v3 1/7] pretty-formats: define "literal formatting code" Junio C Hamano
2023-08-20 8:53 ` [PATCH v4 0/8] pretty: add %(decorate[:<options>]) format Andy Koppe
2023-08-20 8:53 ` [PATCH v4 1/8] pretty-formats: define "literal formatting code" Andy Koppe
2023-08-20 8:53 ` [PATCH v4 2/8] pretty-formats: enclose options in angle brackets Andy Koppe
2023-08-20 8:53 ` [PATCH v4 3/8] decorate: refactor format_decorations() Andy Koppe
2023-08-20 8:53 ` [PATCH v4 4/8] decorate: avoid some unnecessary color overhead Andy Koppe
2023-08-20 8:53 ` [PATCH v4 5/8] decorate: color each token separately Andy Koppe
2023-08-20 8:53 ` [PATCH v4 6/8] pretty: add %(decorate[:<options>]) format Andy Koppe
2023-08-20 8:53 ` [PATCH v4 7/8] pretty: add pointer and tag options to %(decorate) Andy Koppe
2023-08-20 8:53 ` [PATCH v4 8/8] decorate: use commit color for HEAD arrow Andy Koppe
2023-08-20 18:50 ` [PATCH v5 0/8] pretty: add %(decorate[:<options>]) format Andy Koppe
2023-08-20 18:50 ` [PATCH v5 1/8] pretty-formats: define "literal formatting code" Andy Koppe
2023-08-20 18:50 ` [PATCH v5 2/8] pretty-formats: enclose options in angle brackets Andy Koppe
2023-08-20 18:50 ` [PATCH v5 3/8] decorate: refactor format_decorations() Andy Koppe
2023-08-20 18:50 ` [PATCH v5 4/8] decorate: avoid some unnecessary color overhead Andy Koppe
2023-08-20 18:50 ` [PATCH v5 5/8] decorate: color each token separately Andy Koppe
2023-08-20 18:50 ` [PATCH v5 6/8] pretty: add %(decorate[:<options>]) format Andy Koppe
2023-08-20 18:50 ` [PATCH v5 7/8] pretty: add pointer and tag options to %(decorate) Andy Koppe
2023-08-20 18:50 ` [PATCH v5 8/8] decorate: use commit color for HEAD arrow Andy Koppe
2023-08-29 21:59 ` [PATCH v5 0/8] pretty: add %(decorate[:<options>]) format Junio C Hamano
2023-09-01 21:33 ` Andy Koppe
2023-08-21 19:01 ` [PATCH v4 " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq350kjfk8.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=andy.koppe@gmail.com \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).