diff --git a/src/git/enrichers/logParserEnricher.ts b/src/git/enrichers/logParserEnricher.ts index 15021b4..3556334 100644 --- a/src/git/enrichers/logParserEnricher.ts +++ b/src/git/enrichers/logParserEnricher.ts @@ -202,7 +202,8 @@ export class GitLogParserEnricher implements IGitEnricher { if (recentCommit) { recentCommit.previousSha = commit.sha; - commit.nextSha = recentCommit.sha; + // If the commit sha's match (merge commit), just forward it along + commit.nextSha = commit.sha !== recentCommit.sha ? recentCommit.sha : recentCommit.nextSha; // Only add a filename if this is a file log if (type === 'file') { recentCommit.previousFileName = commit.originalFileName || commit.fileName;