f932e616
merge overlay back
a73x 2026-03-29 10:22
Commit message
nono
| Old | New | ||
|---|---|---|---|
| @@ -18,6 +18,21 @@ if [[ "${1:-}" == "allow" ]]; then | |||
| 18 | exit | 18 | exit |
| 19 | fi | 19 | fi |
| 20 | 20 | ||
| 21 | if [[ "${1:-}" == "merge" ]]; then | ||
| 22 | if [[ ! -d "$UPPER" ]]; then | ||
| 23 | echo "no overlay session for $(basename "$BASE")" >&2 | ||
| 24 | exit 1 | ||
| 25 | fi | ||
| 26 | patch=$("$0" bash -c 'git diff --cached -- . ":(exclude)nono-proxy"') | ||
| 27 | if [[ -z "$patch" ]]; then | ||
| 28 | echo "nothing to merge" | ||
| 29 | exit 0 | ||
| 30 | fi | ||
| 31 | echo "$patch" | git apply | ||
| 32 | echo "merged overlay changes into $BASE" | ||
| 33 | exit | ||
| 34 | fi | ||
| 35 | |||
| 21 | # --- sandbox --- | 36 | # --- sandbox --- |
| 22 | 37 | ||
| 23 | mkdir -p "$UPPER" "$WORK" | 38 | mkdir -p "$UPPER" "$WORK" |