forked from llvm/llvm-project
-
Notifications
You must be signed in to change notification settings - Fork 330
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Monorepo fixup] reset untracked directory contents to match apple/st…
…able/20190619 The monorepo conversion for the swift/master branch brought in contents in untracked directory that landed after the apple/stable/20190619 branch was cut. This commit fixes this content by resetting the sub-trees to match apple/stable/20190619. Here's how this commit was contructed: Step 1: reset the subtrees to match the apple/stable/20190619 state repos="debuginfo-tests libclc libcxxabi libunwind lld llgo openmp parallel-libs polly pstl" for repo in $repos do git rm -rf $repo > /dev/null latest_commit=$(git rev-list HEAD -n1 -- $repo) tree=$(git rev-parse origin/apple/stable/20190619:$repo) git read-tree --prefix=$repo $tree echo "LATEST COMMIT FOR $repo -p $latest_commit" done Step 2: construct an octopus merge commit with new subtrees tree=$(git write-tree) git commit-tree -p HEAD -p ... -m "[Monorepo fixup] ..." $tree
- Loading branch information
Showing
933 changed files
with
38,982 additions
and
39,362 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.