summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2016-12-06 13:22:30 -0500
committerJames Cammarata <jimi@sngx.net>2016-12-06 13:22:30 -0500
commitf38ca6c92f0ee06d52c3db6135d23b4c1de308d8 (patch)
treedc59cc600a7c9cdf1e58961b0e6367acc8af442b
parent4c3da9e81bfb39cda942d04eefbdca3133fc3b47 (diff)
parentcec170125ff46009f23206fb78322c7eb4df8163 (diff)
downloadansible-f38ca6c92f0ee06d52c3db6135d23b4c1de308d8.tar.gz
Merge branch 'devel' of https://github.com/ansible/ansible into devel
-rwxr-xr-xhacking/unify_repos.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/hacking/unify_repos.sh b/hacking/unify_repos.sh
index e91a1d14fe..d4c7ecbaae 100755
--- a/hacking/unify_repos.sh
+++ b/hacking/unify_repos.sh
@@ -5,14 +5,15 @@ set -e
set -u
# get current stuff
-git clone git@github.com:ansible/ansible.git ansible_unified
+git clone https://github.com/ansible/ansible.git ansible_unified
cd ansible_unified/
git submodule init
git submodule update
+git remote add upstream git@github.com:ansible/ansible.git
# add submodules as remotes
-git remote add core_modules git@github.com:ansible/ansible-modules-core.git
-git remote add extras_modules git@github.com:ansible/ansible-modules-extras.git
+git remote add core_modules https://github.com/ansible/ansible-modules-core.git
+git remote add extras_modules https://github.com/ansible/ansible-modules-extras.git
git fetch --all
# remove submodules
@@ -52,5 +53,5 @@ do
fi
done
- git rm -rf lib/ansible/modules/${subdir}
+ rm -rf lib/ansible/modules/${subdir}
done