]> git.ozlabs.org Git - next-scripts/blobdiff - do_revert
various updates
[next-scripts] / do_revert
index e8844e7ba54e19aa97b54b666ec20afbcae262b8..f67929018b0f00d09a170757f191004a3704ec0f 100755 (executable)
--- a/do_revert
+++ b/do_revert
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 LOG_FILE="../merge.log"
-build_host="sprygo"
+build_host="ka2"
 build_dir="/scratch/sfr/next"
 build_cmd="bin/build_next"
 
@@ -14,7 +14,14 @@ no_build=false
 rev=$1
 shift
 
-[ -n "$1" ] && build_host="$1"
+[ -n "$1" ] && {
+       build_host="$1"
+       shift
+}
+[ -n "$1" ] && {
+       build_dir="$1"
+       shift
+}
 
 log()
 {
@@ -32,8 +39,8 @@ GIT_EDITOR=: execute git revert $rev || exit 1
 
 $no_build && exit 0
 
-rsync -avH --exclude .git --delete . "$build_host":"$build_dir"/. || {
-       echo Rsync failed 1>&2
+git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+       echo git push failed 1>&2
        bash -i || exit
 }
 ssh "$build_host" "$build_cmd" || {