summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xch1
-rwxr-xr-xsupercherry7
2 files changed, 7 insertions, 1 deletions
diff --git a/ch b/ch
index c875649..b76acaa 100755
--- a/ch
+++ b/ch
@@ -190,6 +190,7 @@ chclean() {
chclean-single() {
__chrootalias_resolve_create "$1" || return
if [[ -e $copydir ]]; then
+ sudo btrfs subvolume delete "$copydir/var/lib/portables" || true
sudo btrfs subvolume delete "$copydir/var/lib/machines" || true
sudo btrfs subvolume delete "$copydir"
sudo rm -f "${copydir%/}.lock"
diff --git a/supercherry b/supercherry
index fad2460..568b342 100755
--- a/supercherry
+++ b/supercherry
@@ -5,6 +5,11 @@
base="${1:-master}"
+remotes=("${@:2}")
+
+if [[ "${#remotes[@]}" -eq 0 ]]; then
+ remotes=(refs/remotes)
+fi
RED="\e[1;31m"
GREEN="\e[0;32m"
@@ -15,7 +20,7 @@ GRAY="\e[0;37m"
NONE="\e[0;0m"
-for ref in $(git for-each-ref --format='%(refname)' refs/remotes); do
+for ref in $(git for-each-ref --format='%(refname)' "${remotes[@]}"); do
sha1="$(git rev-parse --verify $ref)"
if [ "$(git merge-base $ref $base)" = "$sha1" ]; then
continue