From 365fa141ef336e68cdd2340c6f4f67b05a39b025 Mon Sep 17 00:00:00 2001 From: Bastien Curutchet Date: Wed, 3 Jun 2026 09:36:58 +0200 Subject: [PATCH] docker: remove --tree-branch argument run.sh calls ingest_mdir.py with the --tree-branch option. This option has been deleted by commit bf90222 ("ingest_mdir: use current branch in the kernel tree"). Remove the --tree-branch option. Also remove the '-b nipa-local' from the 'git clone' command as we now directly use what's checked out Signed-off-by: Bastien Curutchet --- docker/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/run.sh b/docker/run.sh index c2a0a35..98b7f35 100755 --- a/docker/run.sh +++ b/docker/run.sh @@ -15,7 +15,7 @@ echo >&2 Creating CoW tree... if ! cp -a --reflink=always $NIPA_TREE ./nipa-run/tree 2>/dev/null; then echo >&2 Falling back to git clone and hardlinks... rm -rf ./nipa-run/tree - git clone -b nipa-local $NIPA_TREE ./nipa-run/tree + git clone $NIPA_TREE ./nipa-run/tree fi # nipa doesn't work if HEAD is pointing to nipa-local, so generate a # guaranteed random branch name as HEAD. This always happens on @@ -48,4 +48,4 @@ docker run $DOCKER_FLAGS --rm --user=nipa \ -v $PWD/ccache:/home/nipa/.ccache \ -v $PWD/ccache:/root/.ccache \ --name nipa-local nipa-local \ - /nipa/ingest_mdir.py --mdir /nipa-patches --tree /nipa-run/tree --tree-name $NIPA_TREE_NAME --tree-branch nipa-local + /nipa/ingest_mdir.py --mdir /nipa-patches --tree /nipa-run/tree --tree-name $NIPA_TREE_NAME