fix: determine git toplevel before reading .git/COMMIT_EDITMSG

test: set git user and email

test: ensure git ident setting do not bleed

test: rm temporary dir from outside to ensure windows compat

Author: marionebl

source/library/get-messages.js

@@ -1,15 +1,25 @@
-// core modules
-import {
-	readFile as readFileNodeback
-} from 'fs';
-
-import denodeify from 'denodeify';
+import {join} from 'path';
 import gitRawCommits from 'git-raw-commits';
+import gitToplevel from 'git-toplevel';
+import {readFile} from 'mz/fs';
 
-const readFile = denodeify(readFileNodeback);
+export default getCommitMessages;
 
 // Get commit messages
-function getCommits(options) {
+// Object => Promise<Array<String>>
+async function getCommitMessages(settings) {
+	const {from, to, edit} = settings;
+
+	if (edit) {
+		return getEditCommit();
+	}
+
+	return await getHistoryCommits({from, to});
+}
+
+// Get commit messages from history
+// Object => Promise<Array<String>>
+function getHistoryCommits(options) {
 	return new Promise((resolve, reject) => {
 		const data = [];
 		gitRawCommits(options)
@@ -21,17 +31,11 @@ function getCommits(options) {
 	});
 }
 
-// Get commit messages
-export default async settings => {
-	const {from, to, edit} = settings;
-
-	if (edit) {
-		const editFile = await readFile(`.git/COMMIT_EDITMSG`);
-		return [`${editFile.toString('utf-8')}\n`];
-	}
-
-	return await getCommits({
-		from,
-		to
-	});
-};
+// Get recently edited commit message
+// () => Promise<Array<String>>
+async function getEditCommit() {
+	const top = await gitToplevel();
+	const editFilePath = join(top, '.git/COMMIT_EDITMSG');
+	const editFile = await readFile(editFilePath);
+	return [`${editFile.toString('utf-8')}\n`];
+}

test/integration/get-messages.js

@@ -5,7 +5,7 @@ import {join} from 'path';
 import test from 'ava';
 import denodeify from 'denodeify';
 import execa from 'execa';
-import {writeFile} from 'mz/fs';
+import {mkdir, writeFile} from 'mz/fs';
 import exists from 'path-exists';
 import rimraf from 'rimraf';
 import expect from 'unexpected';
@@ -44,19 +44,42 @@ test.serial('get history commit messages', async () => {
 	await cleanRepository(repo);
 });
 
+test.serial('get edit commit message from git subdirectory', async () => {
+	const repo = await initRepository();
+
+	await mkdir('beta');
+	await writeFile('beta/beta.txt', 'beta');
+	process.chdir('beta');
+	await execa('git', ['add', '.']);
+	await execa('git', ['commit', '-m', 'beta']);
+
+	const expected = ['beta\n\n'];
+	const actual = await getMessages({edit: true});
+	expect(actual, 'to equal', expected);
+
+	await cleanRepository(repo);
+});
+
 async function initRepository() {
 	const previous = process.cwd();
 	const directory = join(tmpdir(), rand());
+
 	await execa('git', ['init', directory]);
+
 	process.chdir(directory);
+
+	await execa('git', ['config', 'user.email', '[email protected]']);
+	await execa('git', ['config', 'user.name', 'ava']);
+
 	return {directory, previous};
 }
 
 async function cleanRepository(repo) {
+	process.chdir(repo.previous);
+
 	if (await exists(repo.directory)) {
 		await rm(repo.directory);
 	}
-	process.chdir(repo.previous);
 }
 
 function rand() {