|
@@ -292,6 +292,7 @@ fi
|
|
|
if [[ "$cleanup_worktree" == "1" ]]; then
|
|
if [[ "$cleanup_worktree" == "1" ]]; then
|
|
|
cleanup() {
|
|
cleanup() {
|
|
|
trap - EXIT INT TERM
|
|
trap - EXIT INT TERM
|
|
|
|
|
+ git -C "$APP_DIR" branch -D "${runtime_branch}-untrimmed" >/dev/null 2>&1 || true
|
|
|
git -C "$APP_DIR" worktree remove --force "$work_dir" >/dev/null 2>&1 || {
|
|
git -C "$APP_DIR" worktree remove --force "$work_dir" >/dev/null 2>&1 || {
|
|
|
rm -rf "$work_dir"
|
|
rm -rf "$work_dir"
|
|
|
git -C "$APP_DIR" worktree prune >/dev/null 2>&1 || true
|
|
git -C "$APP_DIR" worktree prune >/dev/null 2>&1 || true
|
|
@@ -432,6 +433,7 @@ if [[ "$max_state_commits" -gt 0 ]]; then
|
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
if [[ "$push_enabled" != "1" ]]; then
|
|
if [[ "$push_enabled" != "1" ]]; then
|
|
|
|
|
+ git -C "$APP_DIR" branch -D "${runtime_branch}-untrimmed" >/dev/null 2>&1 || true
|
|
|
log "[vmess-domain-rotator] git push disabled by GIT_PUSH_ENABLED=${push_enabled}"
|
|
log "[vmess-domain-rotator] git push disabled by GIT_PUSH_ENABLED=${push_enabled}"
|
|
|
elif [[ -z "$push_remote" ]]; then
|
|
elif [[ -z "$push_remote" ]]; then
|
|
|
if [[ "$push_required" == "1" ]]; then
|
|
if [[ "$push_required" == "1" ]]; then
|