Home

Welcome to the trail-of-forks Ghidra wiki!

Branching Strategy

Currently, branches are named according to the respective project they support.

Sleigh

sleigh-HEAD-rebasing - A branch to help regenerate patches for the rolling HEAD commits of upstream Ghidra. This branch is rebased to keep linear history. Patch conflicts should be resolved during rebasing. DO NOT SUBMODULE THIS BRANCH.

sleigh-stable-rebasing - A branch to help regenerate patches for each release of upstream Ghidra. This branch is rebased to keep linear history. Patch conflicts should be resolved during rebasing. DO NOT SUBMODULE THIS BRANCH.

Managing

These branches can be updated with git rebase master or git rebase <latest_release_tag>.

They can also be created (initially) by

# For HEAD
git am ~/src/sleigh/src/patches/HEAD/*.patch
# For latest commit
git am ~/src/sleigh/src/patches/stable/*.patch

The patch files can be generated with the following, assuming you are on the branch that needs patches generated

# For HEAD
git format-patch -o ~/src/sleigh/src/patches/HEAD master..HEAD
# For stable
git format-patch -o ~/src/sleigh/src/patches/stable <latest_release_tag>..HEAD