Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

umpf: fix losing flags while continue #31

Closed
wants to merge 1 commit into from
Closed

umpf: fix losing flags while continue #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions umpf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ bailout() {
IDENTICAL="${IDENTICAL}"
STABLE="${STABLE}"
UPDATE="${UPDATE}"
FLAGS="${FLAGS}"
FLAGS="$(<"${STATE}/flags")"
VERSION_SEPARATOR="${VERSION_SEPARATOR}"
VERSION="${VERSION}"
EOF
Expand Down Expand Up @@ -210,7 +210,7 @@ EOF
### setup ###

setup() {
local tmp args o l topic commitish
local tmp args o l topic commitish content
if tmp="$(git config umpf.patch-dir)"; then
PATCH_DIR="${tmp}"
fi
Expand Down Expand Up @@ -321,6 +321,11 @@ setup() {
GIT_FALLBACK_REMOTE="${GIT_FALLBACK_REMOTE}/"
fi

if [ -n "${FLAGS}" ] || [ -f "${STATE}/flags" ]; then
content=${FLAGS:-$(<"${STATE}/flags")}
check_flags
fi

for topic in "${!OVERRIDES[@]}"; do
local rev

Expand Down