From cc934691cc71618f7540862feabbbcdf9afc11e8 Mon Sep 17 00:00:00 2001 From: Sergey Antropoff Date: Sat, 18 Jul 2026 08:52:59 +0300 Subject: [PATCH] Allow multiline commit messages in make push and ignore Pulumi test reports. --- .gitignore | 3 +++ Makefile | 28 ++++++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index efb7eac..a4e627b 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,6 @@ docker-compose.override.yml # Lab probe output (regenerated by scripts/probe_api_surface.py) evidence/_api_surface_probe.json + +# Pulumi test reports (regenerated locally) +pulumi-tests/reports/* diff --git a/Makefile b/Makefile index b9e280c..53a316b 100644 --- a/Makefile +++ b/Makefile @@ -169,24 +169,28 @@ smoke: ## Keystone → multi-service OpenStack smoke shell: ## Open an interactive shell in the development container $(COMPOSE) run --rm --no-deps $(SERVICE_DEV) bash -push: ## git add ., ask for commit message, push to origin + antropoff - @git add . - @if git diff --cached --quiet; then \ - echo "Nothing to commit (working tree clean after git add .)."; \ +push: ## git add ., multiline commit message (Ctrl-D), push origin + antropoff + @set -e; \ + git add .; \ + echo "=== staged ==="; \ + git status --short; \ + echo; \ + if git diff --cached --quiet; then \ + echo "Nothing to commit — pushing current branch."; \ else \ if [ -n "$(MSG)" ]; then \ msg="$(MSG)"; \ else \ - printf "Commit message: "; \ - IFS= read -r msg < /dev/tty; \ - fi; \ - if [ -z "$$msg" ]; then \ - echo "Empty commit message; aborting." >&2; \ - exit 1; \ + echo "Enter commit message, then Ctrl-D:"; \ + msg=$$(cat &2; exit 1; fi; \ git commit -m "$$msg"; \ - fi - git push origin HEAD + fi; \ + echo "Pushing to origin and antropoff:"; \ + git remote get-url --push origin | sed 's/^/ - /'; \ + git remote get-url --push antropoff | sed 's/^/ - /'; \ + git push origin HEAD; \ git push antropoff HEAD clean: ## Remove generated local artifacts