correctly solved merge commits

Author: SPRINX0\prochazka

src/diflow.test.ts

@@ -11,6 +11,7 @@ import {
 } from './testrepo';
 import { Processor } from './processor';
 import { execAsync, sleep } from './tools';
+import { rimraf } from 'rimraf';
 
 describe('Git Repository Tests', () => {
   beforeEach(async () => {
@@ -245,4 +246,44 @@ describe('Git Repository Tests', () => {
     expect(await fs.exists(path.join(getTestRepoPath('merged'), 'only-base.txt'))).toBe(false);
     expect(await fs.exists(path.join(getTestRepoPath('base'), 'only-base.txt'))).toBe(false);
   });
+
+  test('Git merge', async () => {
+    await execAsync('git checkout -b feature', { cwd: getTestRepoPath('base') });
+    await createTestCommit(getTestRepoPath('base'), 'feature1.txt', 'feature1', 'base', 'feature1');
+
+    await sleep(1100);
+    await execAsync('git checkout master', { cwd: getTestRepoPath('base') });
+    await createTestCommit(getTestRepoPath('base'), 'master1.txt', 'master1', 'base', 'master1');
+
+    await sleep(1100);
+    await execAsync('git checkout feature', { cwd: getTestRepoPath('base') });
+    await createTestCommit(getTestRepoPath('base'), 'feature2.txt', 'feature2', 'base', 'feature2');
+
+    await beforeDiflow();
+
+    const processor1 = new Processor(getTestRepoPath('config'), path.join(__dirname, 'workrepos'), 'master');
+    await processor1.process();
+
+    await afterDiflow();
+
+    await checkStateInConfig();
+
+    await sleep(1100);
+    await execAsync('git checkout master', { cwd: getTestRepoPath('base') });
+    await execAsync('git merge feature', { cwd: getTestRepoPath('base') });
+
+    await beforeDiflow('tmp2');
+
+    await rimraf(path.join(__dirname, 'workrepos'));
+    const processor2 = new Processor(getTestRepoPath('config'), path.join(__dirname, 'workrepos'), 'master');
+    await processor2.process();
+
+    await afterDiflow();
+
+    await checkStateInConfig();
+
+    expect(await fs.exists(path.join(getTestRepoPath('merged'), 'feature1.txt'))).toBe(true);
+    expect(await fs.exists(path.join(getTestRepoPath('merged'), 'feature2.txt'))).toBe(true);
+    expect(await fs.exists(path.join(getTestRepoPath('merged'), 'master1.txt'))).toBe(true);
+  });
 });

src/testrepo.ts

@@ -112,13 +112,13 @@ export async function initTestRepos() {
   await createTestCommit(getTestRepoPath('config'), 'state.json', stateContent, 'config');
 }
 
-export async function beforeDiflow() {
+export async function beforeDiflow(tmpBranchName = 'tmp') {
   console.log('Checking out new tmp branch');
-  await execAsync('git checkout -b tmp', { cwd: getTestRepoPath('merged') });
-  await execAsync('git checkout -b tmp', { cwd: getTestRepoPath('base') });
-  await execAsync('git checkout -b tmp', { cwd: getTestRepoPath('diff') });
-  await execAsync('git checkout -b tmp', { cwd: getTestRepoPath('config') });
-  console.log('Checked out new tmp branch');
+  await execAsync(`git checkout -b ${tmpBranchName}`, { cwd: getTestRepoPath('merged') });
+  await execAsync(`git checkout -b ${tmpBranchName}`, { cwd: getTestRepoPath('base') });
+  await execAsync(`git checkout -b ${tmpBranchName}`, { cwd: getTestRepoPath('diff') });
+  await execAsync(`git checkout -b ${tmpBranchName}`, { cwd: getTestRepoPath('config') });
+  console.log(`Checked out new ${tmpBranchName} branch`);
 }
 
 export async function afterDiflow() {

src/tools.ts

@@ -21,7 +21,7 @@ export async function runGitCommand(repoPath: string, cmd: string): Promise<stri
 export async function getCommits(repoPath: string, branch: string): Promise<Commit[]> {
   const log = await runGitCommand(
     repoPath,
-    `log ${branch} --reverse --pretty=format:"%H@|@%ct@|@%aN@|@%aE@|@%s@|@%ad"`
+    `log ${branch} --reverse --first-parent --pretty=format:"%H@|@%ct@|@%aN@|@%aE@|@%s@|@%ad"`
   );
   const res = log
     .split('\n')
@@ -64,7 +64,7 @@ export function filterCommitsToProcess(
 }
 
 export async function getDiffForCommit(repoPath: string, commitHash: string): Promise<ChangeItem[]> {
-  const diff = await runGitCommand(repoPath, `show --name-status ${commitHash}`);
+  const diff = await runGitCommand(repoPath, `show --name-status --diff-merges=first-parent ${commitHash}`);
   return diff
     .split('\n')
     .filter(x => x.match(/^(A|M|D|R\d\d\d)\t/))