summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
6 daysWhat's cooking (2026/09 #03)todoJunio C Hamano1-193/+251
9 daysWhat's cooking (2026/09 #02)Junio C Hamano1-189/+241
10 daysupdate-from-lore: enhance "afresh" modeJunio C Hamano1-5/+28
$ update-from-lore $URL [topic [base]] With one or two args, require to be on a detached HEAD. With three args, the HEAD is detached to the third argument, base. The patch series named by $URL is applied there. Further, with two or three args, create the topic branch with the resulting commit.
11 daysReintegrate, cook: adopt 'Looking good'Junio C Hamano2-2/+2
11 daysWhat's cooking (2026/09 #01)Junio C Hamano1-280/+256
13 daysWhat's cooking (2026/08 #13)Junio C Hamano1-294/+308
13 daysMeta/update-from-lore: go interactive at the end to save typingJunio C Hamano1-0/+13
2026-08-28What's cooking (2026/08 #12)Junio C Hamano1-481/+204
2026-08-26What's cooking (2026/08 #11)Junio C Hamano1-542/+720
2026-08-25Meta/cook: omit base merges from commit count of a topicJunio C Hamano1-1/+5
2026-08-23Dothem/Make: prepare for proper worktree supportJunio C Hamano2-2/+10
We used to (and we still may) depend on the new-workdir layout where we could force checkout the same branch in the buildfarm directory. Let's migrate it to use the officially supported worktree feature, but be on detached HEADs. Teach METAMAKEBRANCH environment variable to Meta/Make, so that even a build on a detached HEAD can be told for which branch it is building and installing. Use the variable in Meta/Dothem and adjust the script minimally. So far, once the trees are set up, updating to newer revision and building seem to work OK. Nothing is done for bootstrapping part, but this should do for now.
2026-08-23Meta/onemerge: force C locale on commJunio C Hamano1-0/+2
The script has 'comm' compare two 'git branch --list' output, which is strictly ASCII/lexicographic order. In en_US locale, for example, the 'git branch --list' output order may not look sorted, e.g. 'pack-objects' may sort before or after 'packfile'.
2026-08-23What's cooking (2026/08 #10)Junio C Hamano1-185/+109
2026-08-20What's cooking (2026/08 #09)Junio C Hamano1-272/+327
2026-08-20Meta/update-from-lore: accept an existing branch name to updateJunio C Hamano1-1/+12
2026-08-18What's cooking (2026/08 #08)Junio C Hamano1-204/+156
2026-08-16What's cooking (2026/08 #07)Junio C Hamano1-209/+217
2026-08-14What's cooking (2026/08 #06)Junio C Hamano1-262/+309
2026-08-13Meta/Dothem: $T == --test=X must come early on Meta/Make command lineJunio C Hamano1-3/+3
2026-08-13Meta/cook -w: give cf and source links for candidates for 'next'Junio C Hamano1-2/+1
2026-08-12What's cooking (2026/08 #05)Junio C Hamano1-157/+295
2026-08-12Meta/cook: add -s optionJunio C Hamano1-1/+20
2026-08-10What's cooking (2026/08 #04)Junio C Hamano1-194/+127
2026-08-07What's cooking (2026/08 #03)Junio C Hamano1-304/+268
2026-08-05What's cooking (2026/08 #02)Junio C Hamano1-414/+265
2026-08-03What's cooking (2026/08 #01)Junio C Hamano1-556/+466
2026-07-29What's cooking (2026/07 #13)Junio C Hamano1-335/+468
2026-07-26Meta/cook: make it slightly easier to debugJunio C Hamano1-0/+3
When the blurb pattern finds no match, the program only said that it does not match and died. It would be very hard to make it report that this and that token in the blurb text is misspelt and it would match the pattern when that typo gets fixed, but at least it should be able to dump the haystack it was looking for needles in to let the human user do the guessing.
2026-07-26What's cooking (2026/07 #12)Junio C Hamano1-109/+225
2026-07-26Meta/Count: do not add unnecessary @{now}Junio C Hamano1-4/+4
2026-07-24What's cooking (2026/07 #11)Junio C Hamano1-328/+207
2026-07-24Meta/update-from-lore: support initial import as wellJunio C Hamano1-0/+14
2026-07-22What's cooking (2026/07 #10)Junio C Hamano1-499/+296
2026-07-21Meta/onemerge: clean temporary files correctly and exit non-zero upon failureJunio C Hamano1-3/+2
2026-07-20What's cooking (2026/07 #09)Junio C Hamano1-579/+446
2026-07-20Meta/Reintegrate: allow preparing an update on a detached HEADJunio C Hamano1-1/+1
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-19CheckPush: run basecheck as well as onemergeJunio C Hamano1-1/+2
2026-07-18What's cooking (2026/07 #08)Junio C Hamano1-354/+362
2026-07-18Meta/basecheck: validate the synthetic base of topicsJunio C Hamano1-0/+51
2026-07-18Meta/Make: support '-s'Junio C Hamano1-1/+5
2026-07-17Meta/pushall: allow mirrors configurable the same way as sites and nextsJunio C Hamano1-1/+1
2026-07-16What's cooking (2026/07 #07)Junio C Hamano1-317/+441
2026-07-16Meta/onemerge: fix custom endpoint handlingJunio C Hamano1-1/+1
2026-07-14What's cooking (2026/07 #06)Junio C Hamano1-222/+314
2026-07-14Meta/update-from-lore: pass --force down to 'git detach'Junio C Hamano1-3/+3
2026-07-13onemerge: quick check and exit when the numbers matchJunio C Hamano1-0/+8
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-12What's cooking (2026/07 #05)Junio C Hamano1-288/+390
2026-07-11Meta/Announce: do not credit AI agentsJunio C Hamano1-1/+2
2026-07-10Meta/cook: support --newer to list 'new iteration exists'Junio C Hamano1-1/+28
2026-07-09What's cooking (2026/07 #04)Junio C Hamano1-547/+428
generated by cgit (git 2.54.0.dirty) at 2026-09-14 04:35:19 +0000