buildman --branch doesn't handle ranges quite right
Consider the following:
$ git checkout -b first-branch aaeaef253619
Switched to a new branch 'first-branch'
$ git checkout -b second-branch e5b082a3c594
Switched to a new branch 'second-branch'
$ git branch -u first-branch
Branch 'second-branch' set up to track local branch 'first-branch'.
$ ./tools/buildman/buildman --dry-run --step 0 -b first-branch..
Dry run, so not doing much. But I would do this:
Building 2 commits for 1289 boards (16 threads, 1 job per thread)
Build directory: ../first-branch..
08ece5b3 dm: video: Cosmetic style fix
e5b082a3 Merge tag 'video-20230801' of https://source.denx.de/u-boot/custodians/u-boot-video
Total boards to build for each commit: 1289
$ git log --oneline first-branch..
e5b082a3c594 (HEAD -> second-branch) Merge tag 'video-20230801' of https://source.denx.de/u-boot/custodians/u-boot-video
b8d3a6c7d12f drivers: video: tidss: tidss_drv: Use kconfig VIDEO_REMOVE to remove video
3f9b5a7ffa75 drivers: video: tidss: tidss_drv: Change remove method
e1a0cafcfb85 video: bochs: Set the frame buffer size per configuration
f91f0e74df81 video: kconfig: Set default FB size for Bochs
185ae84af0cb video: kconfig: Drop the superfluous dependency
17cd80237b09 video: kconfig: Fix wrong text for the PCI default FB size
e1b46977dedd video: bochs: Remove the x86 dependency
ffe1c8379e82 video: bochs: Avoid using IO instructions to access VGA IO port
caae795a1c6a video: bochs: Drop the useless argument of bochs_vga_write()
5ee029a190d5 video: bochs: Drop inclusion of <asm/mtrr.h>
08ece5b3ec6c dm: video: Cosmetic style fix
This, thus far, is doing what I said, even if it's not perhaps what I meant. What I really want is the first commit to build be the top of first-branch
:
$ git log -n1 --oneline first-branch
aaeaef253619 (first-branch) Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
But I can't get that:
$ ./tools/buildman/buildman --dry-run --step 0 -b first-branch^..
Dry run, so not doing much. But I would do this:
Building 2 commits for 1289 boards (16 threads, 1 job per thread)
Build directory: ../first-branch^..
414236b8 i2c: i2c-gpio: Correctly handle new {sda, scl}-gpios bindings
e5b082a3 Merge tag 'video-20230801' of https://source.denx.de/u-boot/custodians/u-boot-video
Total boards to build for each commit: 1289
$ git log -n1 --oneline first-branch^
4e619e8d4fd6 Merge tag 'u-boot-rockchip-20230731' of https://source.denx.de/u-boot/custodians/u-boot-rockchip
So I don't see why first-branch^
is different to buildman and to git. If I try to use aaeaef253619
it uses 08ece5b3
again and aaeaef253619^
is once again 414236b8
.
The use case I have here is that since I'm doing a size comparison I want the first build to be the upstream commit so that I can see changes introduced by the first commit in this branch (and so the commits used here are how I would review the video PR).