Skip to content

Instantly share code, notes, and snippets.

@adamjonas

adamjonas/generating_a_patchset.md

Last active June 9, 2020 17:45
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save adamjonas/77570bdc383e85e681f79365cddec5b8 to your computer and use it in GitHub Desktop.
Save adamjonas/77570bdc383e85e681f79365cddec5b8 to your computer and use it in GitHub Desktop.
Download ZIP
Generate a patchset
Raw
generating_a_patchset.md

Error:

>>> [do_build] Command failed: git apply /Users/jonas/bitcoin-dir/bitcoin-maintainer-tools/patches/stripbuildinfo.patch
>>> [do_build] Could not apply patch to strip build info. Probably it needs to be updated

Checkout the patchset from the last patch:

git checkout 'master@{aug 1}'

cat ../bitcoin-maintainer-tools/patches/stripbuildinfo.patch | patch -p1 --dry-run

cat ../bitcoin-maintainer-tools/patches/stripbuildinfo.patch | patch -p1

gc -am 'patch diff'

git rebase master

git format-patch HEAD~..HEAD --stdout

git format-patch HEAD~..HEAD --stdout > ../bitcoin-maintainer-tools/patches/stripbuildinfo.patch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment