Merge pull request #1408 from snyk/fix/cli-dev-count-use-no-merge-in-…

…git-log Fix/cli dev count use no merge in git log
snyk · Sep 15, 2020 · 481ea44 · 481ea44
2 parents 5b3ea60 + 09646bf
commit 481ea44
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/lib/monitor/dev-count-analysis.ts b/src/lib/monitor/dev-count-analysis.ts
@@ -146,7 +146,7 @@ export async function runGitLog(
   fnShellout: (cmd: string, workingDirectory: string) => Promise<string>,
 ): Promise<string> {
   try {
-    const gitLogCommand = `git --no-pager log --pretty=tformat:"%H${SERIOUS_DELIMITER}%an${SERIOUS_DELIMITER}%ae${SERIOUS_DELIMITER}%aI" --after="${timestampEpochSecondsStartOfPeriod}"`;
+    const gitLogCommand = `git --no-pager log --no-merges --pretty=tformat:"%H${SERIOUS_DELIMITER}%an${SERIOUS_DELIMITER}%ae${SERIOUS_DELIMITER}%aI" --after="${timestampEpochSecondsStartOfPeriod}"`;
     const gitLogStdout: string = await fnShellout(gitLogCommand, repoPath);
     return gitLogStdout;
   } catch {

diff --git a/test/dev-count-analysis.jest-test.ts → test/dev-count-analysis.test.ts b/test/dev-count-analysis.jest-test.ts → test/dev-count-analysis.test.ts