Skip to content

jenkins: only run git rebase --abort if rebase in progress #4551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sxa merged 2 commits into from
Nov 4, 2026
+3 −1
Merged

jenkins: only run git rebase --abort if rebase in progress #4551

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e09cfa9
jenkins: only run git rebase --abort if rebase in progress
sxa Nov 2, 2026
ad7462c
remove debug statements
sxa Nov 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion jenkins/scripts/node-test-commit-pre.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ git config user.email
echo $GIT_COMMITTER_NAME
echo $GIT_AUTHOR_NAME

git rebase --abort || 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
Expand Down
Loading