Skip to content

Commit f35b14a

Browse files
committed
cmake: add script to update sanitizers cmake files
problem: git subtree is arcane solution: add a script to pull changes into the subtree
1 parent 7449d46 commit f35b14a

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

cmake/update-sanitizers-cmake.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
# first version pulled from commit 3f0542e on April 19
3+
# add command: git subtree add --prefix=cmake/sanitizers-cmake --squash https://github.com/arsenm/sanitizers-cmake master
4+
#
5+
# To rebase across an update, use `git rebase --rebase-merges --strategy subtree
6+
# if the rebase stops and says "refusing to merge unrelated histories" then use
7+
# the add command above or pull or similar to re-create the merge commit
8+
git subtree pull --prefix cmake/sanitizers-cmake https://github.com/arsenm/sanitizers-cmake master --squash

0 commit comments

Comments
 (0)