Merge pull request #3087 from snyk/feat/count-merge-commits

Dev Count: count merge commits as well
snyk · Apr 1, 2022 · bbed47a · bbed47a
2 parents 69dc4b3 + b1be772
commit bbed47a
Show file tree

Hide file tree

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

diff --git a/test/jest/unit/dev-count-analysis.spec.ts b/test/jest/unit/dev-count-analysis.spec.ts
@@ -19,9 +19,8 @@ const TIMESTAMP_TO_TEST = 1590174610000;
 
 describe('cli dev count via git log analysis', () => {
   let expectedContributoremails: string[] = [];
-  let expectedMergeOnlyemails: string[] = [];
 
-  // this computes the expectedContributoremails and expectedMergeOnlyemails
+  // this computes the expectedContributoremails
   beforeAll(async () => {
     const timestampEpochSecondsEndOfPeriod = Math.floor(
       TIMESTAMP_TO_TEST / 1000,
@@ -42,24 +41,7 @@ describe('cli dev count via git log analysis', () => {
     );
     const uniqueEmails = [...new Set(allEmails)]; // dedupe the list of emails
 
-    const uniqueEmailsContainingOnlyMergeCommits: string[] = []; // a list of emails which are only associated with merge commits; don't include an email if it also have regular commits
-    const uniqueEmailsContainingAtLeastOneNonMergeCommit: string[] = [];
-    for (const nextEmail of uniqueEmails) {
-      const associatedCommits = withMergesLogLines.filter((l) =>
-        l.includes(nextEmail),
-      );
-      const allAssociatedCommitsAreMergeCommits = associatedCommits.every((e) =>
-        e.includes('Merge pull request'),
-      );
-      if (allAssociatedCommitsAreMergeCommits) {
-        uniqueEmailsContainingOnlyMergeCommits.push(nextEmail);
-      } else {
-        uniqueEmailsContainingAtLeastOneNonMergeCommit.push(nextEmail);
-      }
-    }
-
-    expectedContributoremails = uniqueEmailsContainingAtLeastOneNonMergeCommit;
-    expectedMergeOnlyemails = uniqueEmailsContainingOnlyMergeCommits;
+    expectedContributoremails = uniqueEmails;
   }, testTimeout);
 
   it(
@@ -78,25 +60,6 @@ describe('cli dev count via git log analysis', () => {
     testTimeout,
   );
 
-  it(
-    'does not include contributors who have only merged pull requests',
-    async () => {
-      const contributors = await getContributors({
-        endDate: new Date(TIMESTAMP_TO_TEST),
-        periodDays: 10,
-        repoPath: process.cwd(),
-      });
-      const contributoremails = contributors.map((c) => c.email);
-
-      // make sure none of uniqueEmailsContainingOnlyMergeCommits are in contributoremails
-      const legitemailsWhichAreAlsoInMergeOnlyemails = expectedMergeOnlyemails.filter(
-        (user) => contributoremails.includes(user),
-      );
-      expect(legitemailsWhichAreAlsoInMergeOnlyemails).toHaveLength(0);
-    },
-    testTimeout,
-  );
-
   it('can calculate start of contributing developer period', () => {
     const dEndMilliseconds = 1590174610000; // arbitrary timestamp in ms since epoch
     const exectedStartTimestampSeconds = 1590174610 - 90 * 24 * 60 * 60;