summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@also>2011-08-06 02:59:02 +0200
committertv <tv@also>2011-08-06 02:59:02 +0200
commitcda161c9d09be69af53c5c50143ff8bd006cd332 (patch)
tree20d876a8cbd4cd932b7342112e8ba13a45cbbc9a
parent17e9c1ec745cb8ee8ac37c4f88bfc103d05b8d63 (diff)
parentb0b67aed6c880ef0c82049b73f5bdc689c35e6d3 (diff)
Merge branch 'master' of github.com:krebscode/painload
-rwxr-xr-xassimilator/bin/git-clone-into48
1 files changed, 48 insertions, 0 deletions
diff --git a/assimilator/bin/git-clone-into b/assimilator/bin/git-clone-into
new file mode 100755
index 00000000..67e820e6
--- /dev/null
+++ b/assimilator/bin/git-clone-into
@@ -0,0 +1,48 @@
+#! /bin/sh
+#
+# usage: git-clone-into repository directory
+#
+set -euf
+
+tempdir() {
+ set -- `tempnam $1`
+ mkdir $1
+ echo $1
+}
+
+## [prefix] -> tempnam
+tempnam() {
+ until set -- $1 ${1-}`candnam` && ! test -e $2; do :; done
+ echo $2
+}
+
+candnam() {
+ uuidgen 2>/dev/null || date +%s%N
+}
+
+
+
+ tmp_remote=`candnam`
+ tmp_branch=`candnam`
+
+ subdir=$2
+ if test -e $subdir; then
+ echo 'You are made of stupid!' >&2
+ exit 23
+ fi
+ tmpdir=`tempdir /tmp/tempdir-`
+ #trap "test -d $tmpdir && rm -vfR $tmpdir" EXIT
+ trap "test -d $tmpdir && rm -fR $tmpdir" EXIT
+ repository="${1-$repository}"
+ git clone "$repository" $tmpdir
+ (cd $tmpdir
+ subdir="$subdir" git filter-branch --tree-filter '
+ if ! test -d $subdir; then
+ mkdir -p $subdir
+ git ls-tree -z --name-only $GIT_COMMIT | xargs -I. --null mv . $subdir
+ fi
+ '
+ git checkout -b $tmp_branch)
+ git remote add $tmp_remote $tmpdir
+ git fetch $tmp_remote
+ git merge $tmp_remote/$tmp_branch # TODO configurable branch