From e09cfa940ab9071d1f975cf26e091b6ce271fc44 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Mon, 2 Nov 2026 10:36:20 +0000 Subject: [PATCH 1/2] jenkins: only run git rebase --abort if rebase in progress Signed-off-by: Stewart X Addison --- jenkins/scripts/node-test-commit-pre.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jenkins/scripts/node-test-commit-pre.sh b/jenkins/scripts/node-test-commit-pre.sh index 6c408672f..5ce8d4652 100755 --- a/jenkins/scripts/node-test-commit-pre.sh +++ b/jenkins/scripts/node-test-commit-pre.sh @@ -16,7 +16,11 @@ git config user.email echo $GIT_COMMITTER_NAME echo $GIT_AUTHOR_NAME -git rebase --abort || true +pwd +ls -l .git || true +if [ -r .git/rebase-apply ]; then + git rebase --abort +fi git checkout -f refs/remotes/origin/_jenkins_local_branch git config user.name git config user.email From ad7462c8fdc46ffae327869a98090c1842e8e70b Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Tue, 3 Nov 2026 18:45:11 +0000 Subject: [PATCH 2/2] remove debug statements Signed-off-by: Stewart X Addison --- jenkins/scripts/node-test-commit-pre.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/jenkins/scripts/node-test-commit-pre.sh b/jenkins/scripts/node-test-commit-pre.sh index 5ce8d4652..682866938 100755 --- a/jenkins/scripts/node-test-commit-pre.sh +++ b/jenkins/scripts/node-test-commit-pre.sh @@ -16,8 +16,6 @@ git config user.email echo $GIT_COMMITTER_NAME echo $GIT_AUTHOR_NAME -pwd -ls -l .git || true if [ -r .git/rebase-apply ]; then git rebase --abort fi