Skip to content

New and improved cherry-pick support#203

Merged
jbachorik merged 1 commit into
mainfrom
jb/cherry_support
Apr 11, 2025
Merged

New and improved cherry-pick support#203
jbachorik merged 1 commit into
mainfrom
jb/cherry_support

Conversation

@jbachorik

Copy link
Copy Markdown
Collaborator

What does this PR do?:
It adds a better support for cherry-picking. We are not relying on filtered repo any more and instead do on-the-fly path translation and trimming of the changesets.
The usage is ./utils/cherry.sh <commit> and the prerequisite is to have the upstream repo added as a remote, either manually or by ./utils/init_cherrypick_repo.sh

Motivation:
Make the cherry-picks from upstream easier to do while keeping the history.

Additional Notes:

Unsure? Have a question? Request a review!

@github-actions

github-actions Bot commented Apr 10, 2025

Copy link
Copy Markdown
Contributor

🔧 Report generated by pr-comment-scanbuild

Scan-Build Report

User:runner@fv-az1921-959
Working Directory:/home/runner/work/java-profiler/java-profiler/ddprof-lib/src/test/make
Command Line:make -j4 clean all
Clang Version:Ubuntu clang version 18.1.3 (1ubuntu1)
Date:Fri Apr 11 10:14:58 2025

Bug Summary

Bug TypeQuantityDisplay?
All Bugs7
Logic error
Dereference of null pointer3
Suspicious operation
Bitwise shift1
Unused code
Dead initialization2
Dead nested assignment1

Reports

Bug Group Bug Type ▾ File Function/Method Line Path Length
Suspicious operationBitwise shiftvmStructs.cppfind90216
Unused codeDead initializationjavaApi.cppJava_com_datadoghq_profiler_JavaProfiler_getStatus01161
Unused codeDead initializationstackWalker.cppwalkDwarf1841
Unused codeDead nested assignmentvmStructs.cppcheckNativeBinding10071
Logic errorDereference of null pointersafeAccess.hload3318
Logic errorDereference of null pointersymbols_linux.hElfParser17228
Logic errorDereference of null pointerflightRecorder.cppflush15278

@github-actions

github-actions Bot commented Apr 10, 2025

Copy link
Copy Markdown
Contributor

🔧 Report generated by pr-comment-cppcheck

CppCheck Report

Warnings (7)

Style Violations (411)

@jbachorik
jbachorik force-pushed the jb/cherry_support branch 3 times, most recently from a6c0ca3 to 403e9c7 Compare April 11, 2025 10:11
@jbachorik
jbachorik merged commit c74ac25 into main Apr 11, 2025
@jbachorik
jbachorik deleted the jb/cherry_support branch April 11, 2025 12:12
@github-actions github-actions Bot added this to the 1.24.0 milestone Apr 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants