Merge pull request #79 from gitleaks/fix/update-git-log-for-prs

zricethezav · web-flow · commit f65dee2ef48e · 2022-08-05T11:13:41.000-05:00
Draft: update git log options
diff --git a/dist/index.js b/dist/index.js
@@ -69821,7 +69821,9 @@ async function Scan(gitleaksEnableUploadArtifact, scanInfo, eventType) {
       // scan only one commit
       args.push(`--log-opts=-1`);
     } else {
-      args.push(`--log-opts=${scanInfo.baseRef}^..${scanInfo.headRef}`);
+      args.push(
+        `--log-opts=--no-merges --first-parent ${scanInfo.baseRef}^..${scanInfo.headRef}`
+      );
     }
   }
   core.info(`gitleaks cmd: gitleaks ${args.join(" ")}`);
diff --git a/src/gitleaks.js b/src/gitleaks.js
@@ -105,7 +105,9 @@ async function Scan(gitleaksEnableUploadArtifact, scanInfo, eventType) {
       // scan only one commit
       args.push(`--log-opts=-1`);
     } else {
-      args.push(`--log-opts=${scanInfo.baseRef}^..${scanInfo.headRef}`);
+      args.push(
+        `--log-opts=--no-merges --first-parent ${scanInfo.baseRef}^..${scanInfo.headRef}`
+      );
     }
   }
   core.info(`gitleaks cmd: gitleaks ${args.join(" ")}`);

Original file line number	Diff line number	Diff line change
`@@ -69821,7 +69821,9 @@ async function Scan(gitleaksEnableUploadArtifact, scanInfo, eventType) {`
`69821`	`69821`	`// scan only one commit`
`69822`	`69822`	args.push(`--log-opts=-1`);
`69823`	`69823`	`} else {`
`69824`		- args.push(`--log-opts=${scanInfo.baseRef}^..${scanInfo.headRef}`);
	`69824`	`+ args.push(`
	`69825`	+ `--log-opts=--no-merges --first-parent ${scanInfo.baseRef}^..${scanInfo.headRef}`
	`69826`	`+ );`
`69825`	`69827`	`}`
`69826`	`69828`	`}`
`69827`	`69829`	core.info(`gitleaks cmd: gitleaks ${args.join(" ")}`);
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,9 @@ async function Scan(gitleaksEnableUploadArtifact, scanInfo, eventType) {`
`105`	`105`	`// scan only one commit`
`106`	`106`	args.push(`--log-opts=-1`);
`107`	`107`	`} else {`
`108`		- args.push(`--log-opts=${scanInfo.baseRef}^..${scanInfo.headRef}`);
	`108`	`+ args.push(`
	`109`	+ `--log-opts=--no-merges --first-parent ${scanInfo.baseRef}^..${scanInfo.headRef}`
	`110`	`+ );`
`109`	`111`	`}`
`110`	`112`	`}`
`111`	`113`	core.info(`gitleaks cmd: gitleaks ${args.join(" ")}`);