[RFC PATCH v1] tools: update-subtree.sh improve user experience
Quentin Schulz
quentin.schulz at cherry.de
Mon Oct 20 18:01:32 CEST 2025
Hi E,
On 10/15/25 10:38 AM, E Shattow wrote:
> Makeover of the script:
> - Usage now explains at each step what is expected from the user.
> - Default branch name is no longer hard-coded and is queried when omitted.
> - Additional operations 'update' and 'log' close the logic gap between
> expecting the user to provide a commit id and where from this commit id
> should be obtained.
> - Use 'set -x' context to show git invocation where appropriate
> - Sort options for usage output
> - 'pick' operation detects merge commit id and displays suggested commits
>
> Additionally the LwIP remote is now using the Savannah mirror system:
>
> https://lists.gnu.org/archive/html/savannah-users/2025-05/msg00002.html
>
Please try to split changes into multiple commits. There's a lot of
unnecessary noise and it makes difficult to review your patch otherwise.
Here I can identify:
- Cleaning up the comments at the top
- Removing set -e (why?)
- Moving print_usage somewhere else
- Changing the output of print_usage
- Reordering cases in the switch..case for the subtree-name
- Changing URL of GNU mirror (which very much looks like a typo as it
doesn't seem to be what the link pasted above says the new URLs should
look like, albeit working somehow)
- Adding new features (each its own commit please)
You also do not explain what your pain points were when using this
script. This would be useful information now for reviewing and for later
if/when this gets merged so we know what kind of confusion happened in
the past so that potential future reworks don't reintroduce the same
problems.
If I remember correctly, the biggest issue was that a pull dts was
attempted instead of multiple cherry-picks? I believe nobody except Tom
(for DTS) and whoever are the maintainers of lwip/mbedtls for the
respective projects should be running the pull option. The diff is too
big for DTS to be meaningful so for now Tom is essentially pushing to
the branch and then notifying people on the ML that this was done and
that the new base is available in master, c.f.
https://lore.kernel.org/u-boot/20251008220903.GM298503@bill-the-cat/.
Maybe we should also be conveying this better (including
https://docs.u-boot.org/en/latest/develop/devicetree/control.html#resyncing-with-devicetree-rebasing).
Cheers,
Quentin
More information about the U-Boot
mailing list