> +++ b/t/t7505-prepare-commit-msg-hook.sh > @@ -181,5 +181,27 @@ test_expect_success 'with failing hook (merge)' ' > test_must_fail git merge other > > ' > +git merge --abort # cleanup, since the merge failed. Please, avoid having code outside a test_expect_* (see t...
When merging, make the prepare-commit-msg hook have access to the merge state in order to make decisions about the commit message it is preparing. Since `abort_commit` is *only* called after `write_merge_state`, and a successful commit *always* calls `drop_save` to clear the saved stat...
# compatibility with toml-sort-fix pre-commit hook array_trailing_comma = false compact_arrays = true compact_inline_tables = true inline_table_expand = false3 changes: 2 additions & 1 deletion 3 .vscode/settings.json Original file line numberDiff line numberDiff line change @@ -42,5 +...
pre-commit install --install-hooks pre-commit install --hook-type commit-msg # Create virtual environment if it doesn't exist .PHONY: venv venv: $(VENV_DIR)/bin/activate $(VENV_DIR)/bin/activate: @echo "== Creating Virtual Environment ==" $(PYTHON) -m venv $(VENV_DIR) . $(VENV...
pre-commit install --hook-type commit-msg # Create virtual environment if it doesn't exist .PHONY: venv venv: $(VENV_DIR)/bin/activate $(VENV_DIR)/bin/activate: @echo "== Creating Virtual Environment ==" $(PYTHON) -m venv $(VENV_DIR) . $(VENV_DIR)/bin/activate && pip install ...