Allow multiline commit messages in make push and ignore Pulumi test reports.
This commit is contained in:
@@ -73,3 +73,6 @@ docker-compose.override.yml
|
|||||||
|
|
||||||
# Lab probe output (regenerated by scripts/probe_api_surface.py)
|
# Lab probe output (regenerated by scripts/probe_api_surface.py)
|
||||||
evidence/_api_surface_probe.json
|
evidence/_api_surface_probe.json
|
||||||
|
|
||||||
|
# Pulumi test reports (regenerated locally)
|
||||||
|
pulumi-tests/reports/*
|
||||||
|
|||||||
@@ -169,24 +169,28 @@ smoke: ## Keystone → multi-service OpenStack smoke
|
|||||||
shell: ## Open an interactive shell in the development container
|
shell: ## Open an interactive shell in the development container
|
||||||
$(COMPOSE) run --rm --no-deps $(SERVICE_DEV) bash
|
$(COMPOSE) run --rm --no-deps $(SERVICE_DEV) bash
|
||||||
|
|
||||||
push: ## git add ., ask for commit message, push to origin + antropoff
|
push: ## git add ., multiline commit message (Ctrl-D), push origin + antropoff
|
||||||
@git add .
|
@set -e; \
|
||||||
@if git diff --cached --quiet; then \
|
git add .; \
|
||||||
echo "Nothing to commit (working tree clean after git add .)."; \
|
echo "=== staged ==="; \
|
||||||
|
git status --short; \
|
||||||
|
echo; \
|
||||||
|
if git diff --cached --quiet; then \
|
||||||
|
echo "Nothing to commit — pushing current branch."; \
|
||||||
else \
|
else \
|
||||||
if [ -n "$(MSG)" ]; then \
|
if [ -n "$(MSG)" ]; then \
|
||||||
msg="$(MSG)"; \
|
msg="$(MSG)"; \
|
||||||
else \
|
else \
|
||||||
printf "Commit message: "; \
|
echo "Enter commit message, then Ctrl-D:"; \
|
||||||
IFS= read -r msg < /dev/tty; \
|
msg=$$(cat </dev/tty); \
|
||||||
fi; \
|
|
||||||
if [ -z "$$msg" ]; then \
|
|
||||||
echo "Empty commit message; aborting." >&2; \
|
|
||||||
exit 1; \
|
|
||||||
fi; \
|
fi; \
|
||||||
|
if [ -z "$$msg" ]; then echo "Empty commit message, aborting." >&2; exit 1; fi; \
|
||||||
git commit -m "$$msg"; \
|
git commit -m "$$msg"; \
|
||||||
fi
|
fi; \
|
||||||
git push origin HEAD
|
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
|
git push antropoff HEAD
|
||||||
|
|
||||||
clean: ## Remove generated local artifacts
|
clean: ## Remove generated local artifacts
|
||||||
|
|||||||
Reference in New Issue
Block a user