[gentoo-commits] proj/sci:master commit in: scripts/

[Sebastien Fabbro]

commit:     5444c1b59b5ffd2c2f783cb21eb3ba3ae86440b1
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 10:42:34 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 10:44:05 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5444c1b5

Import script, original idea by alexxy

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

---
 scripts/merge-dualHEAD | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/scripts/merge-dualHEAD b/scripts/merge-dualHEAD
new file mode 100755
index 0000000..c926881
--- /dev/null
+++ b/scripts/merge-dualHEAD
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+if [[ -f /usr/lib64/portage/bin/isolated-functions.sh ]]; then
+	. /usr/lib64/portage/bin/isolated-functions.sh
+elif [[ -f /usr/lib/portage/bin/isolated-functions.sh ]]; then
+	. /usr/lib/portage/bin/isolated-functions.sh
+else
+	alias ebegin=echo
+	alias eend=true
+fi
+
+ebegin "Starting from master"
+	echo
+	git checkout master || exit; _ret=$?
+	echo
+eend ${_ret}
+
+ebegin "Fetching everything"
+	echo
+	git fetch --all -v || exit; _ret=$?
+	echo
+eend ${_ret}
+
+ebegin "Merging github"
+	echo
+	git merge -v github/master || exit; _ret=$?
+	echo
+eend ${_ret}
+
+ebegin "Pushing to g.o.g.o"
+	git push -v origin || exit; _ret=$?
+	echo
+eend ${_ret}
+
+ebegin "Branching out github"
+	echo
+	git checkout -b github-merging github/master || exit; _ret=$?
+	echo
+eend ${_ret}
+
+ebegin "Merging in g.o.g.o"
+	echo
+	git merge -v origin/master || exit; _ret=$?
+	echo
+eend ${_ret}
+
+ebegin "Pushing to github"
+	echo
+	git push -v github HEAD:master || exit; _ret=$?
+	echo
+eend ${_ret}
+
+ebegin "Going back to master"
+	echo
+	git checkout master || exit; _ret=$?
+	echo
+eend ${_ret}
+
+ebegin "Removing github branch"
+	echo
+	git branch -v -D github-merging || exit; _ret=$?
+	echo
+eend ${_ret}