fix: prepare commit message hook no longer fires on merge/squash/etc

main
Buddy 2 weeks ago
parent 329cf76ff9
commit 6e6961544e

@ -4,52 +4,38 @@
/*{{ if lookPath "node" -}}*/ /*{{ if lookPath "node" -}}*/
#!/usr/bin/env node #!/usr/bin/env node
const fs = require("fs"); // Add a "# [TICKET-ID]" comment hint to the editor when running a plain
const childProcess = require("child_process"); // `git commit` on a branch containing a ticket ID (e.g. buddy/BE-1234/foo,
const { promisify } = require("util"); // fix/BE-1234/bar). The hint is a comment, so git strips it unless you
// uncomment or retype it.
const exec = promisify(childProcess.exec); //
const readFile = promisify(fs.readFile); // Every other way a commit message gets made is left alone: -m/-F
const writeFile = promisify(fs.writeFile); // ("message"), merge, squash, amend/-c ("commit"), and commit templates
// ("template") all arrive with a mode argument, and we exit immediately.
const [, , message, mode] = process.argv;
import * as fs from "node:fs";
async function main() { import { execSync } from "node:child_process";
const file = await readFile(message, { encoding: "utf8" });
let result; const [, , messagePath, mode] = process.argv;
try {
result = await exec("git rev-parse --abbrev-ref HEAD"); if (mode !== undefined) process.exit(0);
} catch (err) {
return let branch;
} try {
branch = execSync("git rev-parse --abbrev-ref HEAD", {
if (message.match(/^#/)) { encoding: "utf8",
return stdio: ["ignore", "pipe", "ignore"],
} }).trim();
} catch {
const tags = result.stdout process.exit(0); // detached HEAD, rebase, etc.
.split("\n")
.map(branch => branch.match(/[A-Z]+-\d+/g))
.filter(x => !!x)
.reduce((allIDs, matchedIDs) => [...allIDs, ...matchedIDs], [])
.map(id => `[${id}]`);
if (tags.length === 0) {
return;
}
if (tags.find(tag => file.includes(tag))) {
return;
}
const newFile = mode === 'message'
? file + '\n\n' + tags.join(" ")
: `\n\n# ` + tags.join(" ") + "\n" + file;
await writeFile(message, newFile);
} }
main().catch(err => { const ids = branch.match(/[A-Z]+-\d+/g);
console.error(err); if (!ids) process.exit(0);
process.exit(1);
}); const tags = [...new Set(ids)].map(id => `[${id}]`);
const file = fs.readFileSync(messagePath, "utf8");
if (tags.some(tag => file.includes(tag))) process.exit(0);
fs.writeFileSync(messagePath, `\n\n# ${tags.join(" ")}\n${file}`);
/*{{- end }}*/ /*{{- end }}*/

Loading…
Cancel
Save