summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-01 15:00:14 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-01 15:00:14 -0400
commit26b574cec4b5d1d70baf1d33f36e410fbe2bf176 (patch)
treef9a340c7efab172b7168a95908d709cf53928bf7
parentcae10cc3742018bcd8eca6782fd02132fc291e64 (diff)
*.sh: Add boilerplate that I was running as one-liners.
-rwxr-xr-xmove.sh9
-rw-r--r--reset.sh6
2 files changed, 15 insertions, 0 deletions
diff --git a/move.sh b/move.sh
index 5fe8126170..7b29fdd87c 100755
--- a/move.sh
+++ b/move.sh
@@ -11,6 +11,8 @@ in_array() {
set -e
+git checkout -b postmove
+
(
for d in libsystemd libudev machine resolve; do
mkdir src/$d-new
@@ -139,3 +141,10 @@ set -e
-exec grep '#include "sd-' -l -- {} + |
xargs -d $'\n' sed -ri 's|#include "(sd-[^"]*)"|#include <systemd/\1>|'
)
+
+git add .
+git commit -m './move.sh'
+git merge -s ours lukeshu/postmove
+git checkout lukeshu/postmove
+git merge postmove
+git branch -d postmove
diff --git a/reset.sh b/reset.sh
new file mode 100644
index 0000000000..fe2eb19a44
--- /dev/null
+++ b/reset.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -e
+git checkout lukeshu/premove
+git branch -D postmove
+git checkout .
+git clean -xdf