Skip to content

umpf: two fixes for flags propagation #61

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

umpf: two fixes for flags propagation #61

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa9cf11
umpf: preserve flags while creating a umerge
michaelolbrich Oct 17, 2025
cdeac4c
umpf: display flags when showing a umerge
michaelolbrich Oct 17, 2025
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
8 changes: 6 additions & 2 deletions umpf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,9 @@ import_series() {
if [ -n "${GIT_RELATIVE}" ]; then
echo "# umpf-relative: ${GIT_RELATIVE}" >> "${series}"
fi
if [ -n "${FLAGS}" ]; then
echo "# umpf-flags: ${FLAGS}" >> "${series}"
fi
if [ -z "${NAME}" ]; then
if ! NAME="$(${GIT} symbolic-ref -q --short "${import}")"; then
if ${GIT} show-ref --tags --heads -q "${import}"; then
Expand Down Expand Up @@ -934,6 +937,7 @@ parse() {
${has_base} || bailout "${cmd} before base"
test -n "${content}" || bailout "${cmd} line without value"
if [ -z "${FLAGS}" ]; then
FLAGS="${content}"
do_exec flags
fi
;;
Expand Down Expand Up @@ -1621,8 +1625,8 @@ build_hashinfo() {
run_build() {
parse_series build "${STATE}/series"
${GIT} notes add -m "umpf-build-note: $(<"${STATE}/base-name") $(<"${STATE}/name")"
if [ -f "${FLAGS}" ]; then
${GIT} notes append -m "umpf-build-flags: $(<"${FLAGS}")"
if [ -n "${FLAGS}" ]; then
${GIT} notes append -m "umpf-build-flags: ${FLAGS}"
fi
if [ -n "${GIT_RELATIVE}" ]; then
${GIT} notes append -m "umpf-build-relative: ${GIT_RELATIVE}"
Expand Down