Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
#!/bin/bash
# This script takes a remote repository and merges it into
# the current one as a subdirectory
set -e
if [ -z "$1" ]
then
echo "Usage:"
echo " ./merge_repos.sh <repository> [name]"
echo " <repository> remote repository to merge"
echo " [name] sub-directory name (optional)"
exit
fi
REPO_REMOTE="$1"
REPO_NAME="$2"
# infer a name if one is not provided
if [ -z "$REPO_NAME" ]
then
REPO_NAME="${REPO_REMOTE##*/}"
REPO_NAME="${REPO_NAME%.*}"
fi
REPO_DIR_TMP="$(mktemp -d -t "${REPO_NAME##*/}.XXXX")"
echo "REPO REMOTE: $REPO_REMOTE"
echo "REPO NAME: $REPO_NAME"
echo "REPO TMP DIR: $REPO_DIR_TMP"
echo
read -p "Press <Enter> to continue"
# clone other repo
git clone "$REPO_REMOTE" "$REPO_DIR_TMP"
# rewrite the entire history into sub-directory
export REPO_NAME
(
cd $REPO_DIR_TMP &&
git filter-branch -f --prune-empty --tree-filter '
mkdir -p "${REPO_NAME}_tmp"
git ls-tree --name-only $GIT_COMMIT | xargs -I{} mv {} "${REPO_NAME}_tmp"
mv "${REPO_NAME}_tmp" "$REPO_NAME"
'
)
# merge the rewritten repo
git remote add "$REPO_NAME" "$REPO_DIR_TMP"
git fetch "$REPO_NAME"
# if you're running an older version of git, remove --allow-unrelated-histories
git merge --allow-unrelated-histories "$REPO_NAME/master"
# delete the rewritten repo
rm -rf "$REPO_DIR_TMP"
git remote rm "$REPO_NAME"
@gko
Copy link

gko commented Jan 14, 2020

I added a possibility to merge repos into subfolders (i.e. ./subfolder/subfolder/repo)
https://gist.github.com/gko/22128e4c139686252cea2086d93daf00/revisions

@icholy
Copy link
Author

icholy commented Jul 5, 2021

@gko thanks for the tip.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment