From bea8a3201d79880ed18f062c7811d37237741619 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Fri, 9 Dec 2016 12:42:29 -0500
Subject: [PATCH] Remove obsolete files and instructions. (#19079)

* Remove obsolete `unify_repos.sh` script.
* Remove submodule update after checkout reference.
---
 README.md              |  2 +-
 hacking/unify_repos.sh | 57 ------------------------------------------
 2 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100755 hacking/unify_repos.sh

diff --git a/README.md b/README.md
index 73c320b1639..973cc714ea0 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Read the documentation and more at https://ansible.com/
 
 Many users run straight from the development branch (it's generally fine to do so), but you might also wish to consume a release.
 
-You can find instructions [here](https://docs.ansible.com/intro_getting_started.html) for a variety of platforms.  If you decide to go with the development branch, be sure to run `git submodule update --init --recursive` after doing a checkout.
+You can find instructions [here](https://docs.ansible.com/intro_getting_started.html) for a variety of platforms.
 
 If you want to download a tarball of a release, go to [releases.ansible.com](https://releases.ansible.com/ansible), though most users use `yum` (using the EPEL instructions linked above), `apt` (using the PPA instructions linked above), or `pip install ansible`.
 
diff --git a/hacking/unify_repos.sh b/hacking/unify_repos.sh
deleted file mode 100755
index d4c7ecbaaeb..00000000000
--- a/hacking/unify_repos.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-set -x
-set -e
-set -u
-
-# get current stuff
-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 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
-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'
-
-for subdir in core extras
-do
-	# unify directories
-	for mydir in $(find lib/ansible/modules/${subdir} -type d)
-	do
-		mkdir -p ${mydir/$subdir\//}
-	done
-
-	# move plugins
-	for myfile in $(find lib/ansible/modules/${subdir} -type f)
-	do
-		if [ -e ${myfile/$subdir\///} ]; then #mostly to avoid __init__.py clobering
-			echo "skipping ${myfile} as it already exists in destination"
-		else
-			git mv ${myfile} ${myfile/$subdir\//}
-		fi
-	done
-
-	rm -rf lib/ansible/modules/${subdir}
-done