Commit Graph

2682 Commits (2883c9d288e0423a524fc63c8dc75b2dc0f0fbc9)

Author SHA1 Message Date
Junio C Hamano 2883c9d288 What's cooking (2026/07 #11) 2026-07-24 15:09:54 -07:00
Junio C Hamano dea7ccfea1 Meta/update-from-lore: support initial import as well 2026-07-24 13:22:28 -07:00
Junio C Hamano 7e3326a521 What's cooking (2026/07 #10) 2026-07-22 17:28:29 -07:00
Junio C Hamano 26a198328d Meta/onemerge: clean temporary files correctly and exit non-zero upon failure 2026-07-21 12:23:37 -07:00
Junio C Hamano 5759148277 What's cooking (2026/07 #09) 2026-07-20 17:13:02 -07:00
Junio C Hamano 6aa8a2c33d Meta/Reintegrate: allow preparing an update on a detached HEAD
While waiting for build and test of the current round of
integration, we should be able to prepare the next round while on
a detached HEAD.  By running

    $ git co --detach master
    $ INTO=jch Meta/redo-jch.sh

we can prepare a sequence of "Merge branch 'foo' into jch" commits
that can be used to replace 'jch' that is currently being tested,
without disrupting the test.
2026-07-20 11:59:33 -07:00
Junio C Hamano 202efe2a33 CheckPush: run basecheck as well as onemerge 2026-07-19 20:43:36 -07:00
Junio C Hamano 87b88b82c0 What's cooking (2026/07 #08) 2026-07-18 22:46:34 -07:00
Junio C Hamano ccbb5aad8a Meta/basecheck: validate the synthetic base of topics 2026-07-18 19:23:57 -07:00
Junio C Hamano 258c0e24f6 Meta/Make: support '-s' 2026-07-18 19:23:18 -07:00
Junio C Hamano c116abe2c2 Meta/pushall: allow mirrors configurable the same way as sites and nexts 2026-07-17 14:42:34 -07:00
Junio C Hamano 23297dce55 What's cooking (2026/07 #07) 2026-07-16 15:22:24 -07:00
Junio C Hamano 91fb406d3e Meta/onemerge: fix custom endpoint handling 2026-07-16 11:40:01 -07:00
Junio C Hamano 8550e564f5 What's cooking (2026/07 #06) 2026-07-14 14:53:02 -07:00
Junio C Hamano ac7d686d29 Meta/update-from-lore: pass --force down to 'git detach' 2026-07-14 14:43:07 -07:00
Junio C Hamano e942edf96e onemerge: quick check and exit when the numbers match
Before diving into inspecting each merge commit to see if it merges
more than two topics at the same time, we can count the number of
branches that are merged and the number of merge commits.  If they
match, we can skip the more expensive check.

This will break if we merge a topic in multiple steps, but we do not
do that these days, so it would be a reasonable optimization.
2026-07-13 11:07:10 -07:00
Junio C Hamano 8e01790140 What's cooking (2026/07 #05) 2026-07-12 18:35:25 -07:00
Junio C Hamano 41676e2441 Meta/Announce: do not credit AI agents 2026-07-11 15:14:29 -07:00
Junio C Hamano d7de0c6c90 Meta/cook: support --newer to list 'new iteration exists' 2026-07-10 12:13:54 -07:00
Junio C Hamano 6b62845cf6 What's cooking (2026/07 #04) 2026-07-09 14:17:00 -07:00
Junio C Hamano 50bfe25c96 Meta/CheckPush: trigger onemerge as well 2026-07-09 09:37:27 -07:00
Junio C Hamano 1b618efc7c Meta/people: fix name quoting 2026-07-08 11:38:12 -07:00
Junio C Hamano 4cfa0b034b What's cooking (2026/07 #03)
I hate sending the "what's cooking" report too often, but at the
beginning of new cycle it would be OK.
2026-07-07 10:10:35 -07:00
Junio C Hamano 7b8ea1f802 Meta/cook: mark topics that graduated as such 2026-07-06 22:22:13 -07:00
Junio C Hamano f304dc0b18 What's cooking (2026/07 #02) 2026-07-06 06:47:33 -07:00
Junio C Hamano 6a990135b8 What's cooking (2026/07 #01) 2026-07-01 14:30:38 -07:00
Junio C Hamano fb3ee0a9e2 Meta/cook: copyediting the whats-cooking boilerplate 2026-07-01 14:30:07 -07:00
Junio C Hamano 121defe9bf What's cooking (2026/06 #11) 2026-06-29 09:41:25 -07:00
Junio C Hamano 8b4e2f2218 update-from-lore: automate updating from mailing list
When on branch T, detach the HEAD at the base of the branch, and
find the newest iteration of the same topic from lore, apply the
patches, and show the range-diff from what we have.

Depends on having healty "amlog" notes to allow us identify what
patch message resulted in the commit T, and working "b4 am" and the
lore archive that lets us grab the latest iteration.
2026-06-29 09:28:18 -07:00
Junio C Hamano ca61a38eca onemerge: make sure each merge in master..seen brings in only one topic
If a topic B is built on top of a merge of topic A into master, then
we should merge topic A first before topic B when preparing the
integration branches.  Merging topic B first would bring topic A
along with it, which is generally not a good idea if we consider A
and B as two separate topics.
2026-06-29 09:25:16 -07:00
Junio C Hamano 51445a0c5e Meta/people: find whom to send/cc whats-cooking to 2026-06-28 09:32:51 -07:00
Junio C Hamano 1dac7a15ae What's cooking (2026/06 #10) 2026-06-25 15:26:31 -07:00
Junio C Hamano 4f00d2ec7b What's cooking (2026/06 #09) 2026-06-23 09:23:53 -07:00
Junio C Hamano 167f89bcf6 What's cooking (2026/06 #08) 2026-06-22 19:57:59 -07:00
Junio C Hamano f0b532b1b3 What's cooking (2026/06 #07) 2026-06-19 15:14:17 -07:00
Junio C Hamano 388856aaf1 cook: 'Retracted' is a valid state 2026-06-17 14:47:18 -07:00
Junio C Hamano f9b08c9b28 What's cooking (2026/06 #06) 2026-06-17 09:24:14 -07:00
Junio C Hamano d9b424d2f2 What's cooking (2026/06 #05) 2026-06-15 11:55:23 -07:00
Junio C Hamano ec29228757 What's cooking (2026/06 #04) 2026-06-11 06:27:09 -07:00
Junio C Hamano 09d14b04b9 CannedResponses: trim your quote 2026-06-10 06:18:19 -07:00
Junio C Hamano f66322d84c What's cooking (2026/06 #03) 2026-06-09 02:44:26 +09:00
Junio C Hamano 166c839387 What's cooking (2026/06 #02) 2026-06-04 11:34:20 +09:00
Junio C Hamano 388f8b0ec3 What's cooking (2026/06 #01) 2026-06-02 19:16:59 +09:00
Junio C Hamano d0bf7fefe8 Meta/TopicCheck: allow merging on a base before testing 2026-05-30 09:49:14 +09:00
Junio C Hamano 7a49c15ce9 Meta/Reintegrate: 'Comments?' is a valid status 2026-05-30 09:48:42 +09:00
Junio C Hamano 00f39f3659 What's cooking (2026/05 #08) 2026-05-27 16:01:49 +09:00
Junio C Hamano e534deee09 WHat's cooking (2026/05 #07) 2026-05-26 20:50:05 +09:00
Junio C Hamano 2401465e2f What's cooking (2026/05 #06) 2026-05-23 18:04:34 +09:00
Junio C Hamano 9784b6cfb6 Meta/cook: use b4 mbox to attempt to grab all messages in the thread 2026-05-21 16:19:08 +09:00
Junio C Hamano 258ab9e8df What's cooking (2026/05 #05) 2026-05-20 12:10:49 +09:00