git-subtree-merge.sh

#!/bin/sh -ex

if test $# -eq 0
then
	set -- -h
fi

OPTS_SPEC="\
git-subtree-merge   --prefix=<prefix> --message=<message> --branch=<branch>
git-subtree-merge   -v
--
h,help        show the help
v,version     print git-subtree-merge version
p,prefix=     the name of the subdir to split out
m,message=    commit message
b,branch=     branch for split to
"
eval "$(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)"

# exit
while test $# -gt 0
do
	opt="$1"
  shift
	case "$opt" in
	-p)
		prefix="$1" && shift;;
	-m)
		message="$1" && shift;;
	-b)
		branch="$1" && shift;;
	-v)
		version=`npm list git-subtree-merge --depth=0 | grep git-subtree-merge`
		[ -e "$version" ] && version=`npm list git-subtree-merge --depth=0 -g | grep git-subtree-merge`
		echo $version | sed -e 's/.*git-subtree-merge@\([0-9\.]*\).*/\1/'
		exit 0;;
	-h)
    	echo ${OPTS_SPEC} && exit 0;;
	--)
		break;;
	*)
		echo "Unexpected option: $opt" && exit 1;;
	esac
done

[ -z "$prefix" ] && echo "You must provide the --prefix option." && exit 1
[ -z "$branch" ] && echo "You must provide the --branch option." && exit 1
[ -z "$message" ] && echo "You must provide the --message option." && exit 1


current_rev=`git rev-parse HEAD`
subtree_rev=`git rev-parse $branch`

message="$message\n\n\
git-subtree-dir: $prefix\n\
git-subtree-mainline: $current_rev\n\
git-subtree-split: $subtree_rev"

echo $message



git merge --allow-unrelated-histories -Xsubtree="$prefix" -m "$message" $branch
exit 0



# current_branch=`git rev-parse --abbrev-ref HEAD`
# stash_count=`git stash list | wc -l | tr -d ' '`
# git stash save -u
# [ ${stash_count} != `git stash list | wc -l | tr -d ' '` ] && stash_saved=true


# # 2. << Take a snapshot of the files >>
# tmp=$(mktemp -d)
# mv -f ${prefix}/* ${tmp}


# # 3. << Switch branch and clean >>
# git show-ref --quiet refs/heads/${branch} && git checkout -f ${branch} || git checkout --orphan ${branch}
# git reset --hard
# git clean -fd
# git rm -rf --ignore-unmatch *


# # 4. << restore the snapshot >>
# cp -rf ${tmp}/* .


# # 5. << commit changes >>
# git add -A
# [ -n "${message}" ] && git commit -m "${message}" || git commit


# # 6. << Stash pop after task >>
# git checkout -f "$current_branch"
# [ "$stash_saved" ] && git stash pop stash@{0}

exit 0