Skip to content

Commit

Permalink
added script to unify repos
Browse files Browse the repository at this point in the history
in case i forget how to do this, can be deleted afterwards
  • Loading branch information
bcoca committed Oct 4, 2016
1 parent 08a58ae commit 72e6ffa
Showing 1 changed file with 35 additions and 0 deletions.
35 changes: 35 additions & 0 deletions hacking/unify_repos.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#!/bin/sh

set -x
set -e
set -u

# get current stuff
git clone [email protected]:ansible/ansible.git ansible_unified
cd ansible_unified/
git submodule init
git submodule update

# add submodules as remotes
git remote add core_modules [email protected]:ansible/ansible-modules-core.git
git remote add extras_modules [email protected]:ansible/ansible-modules-extras.git
git fetch --all

# remove submodules
echo "" > .gitmodules
git add .gitmodules
git rm --cached lib/ansible/modules/core/
git rm --cached lib/ansible/modules/extras/
git commit -am "removed core and extras submodules"
rm -rf lib/ansible/modules/core
rm -rf lib/ansible/modules/extras

# merge remotes into old submodule dirs
## core
git merge -s ours --allow-unrelated-histories --no-commit core_modules/devel
git read-tree --prefix=lib/ansible/modules/core -u core_modules/devel
git commit -am 'core modules back to main repo'
## extras
git merge -s ours --allow-unrelated-histories --no-commit extras_modules/devel
git read-tree --prefix=lib/ansible/modules/extras -u extras_modules/devel
git commit -am 'extras modules back to main repo'

0 comments on commit 72e6ffa

Please sign in to comment.