f932e616

merge overlay back

a73x   2026-03-29 10:22

---

diff --git a/nono b/nono
index f68f50f..866abd9 100755
--- a/nono
+++ b/nono
@@ -18,6 +18,21 @@ if [[ "${1:-}" == "allow" ]]; then
    exit
fi

if [[ "${1:-}" == "merge" ]]; then
    if [[ ! -d "$UPPER" ]]; then
        echo "no overlay session for $(basename "$BASE")" >&2
        exit 1
    fi
    patch=$("$0" bash -c 'git diff --cached -- . ":(exclude)nono-proxy"')
    if [[ -z "$patch" ]]; then
        echo "nothing to merge"
        exit 0
    fi
    echo "$patch" | git apply
    echo "merged overlay changes into $BASE"
    exit
fi

# --- sandbox ---

mkdir -p "$UPPER" "$WORK"