opengrok icon indicating copy to clipboard operation
opengrok copied to clipboard

Published 20 hours ago • verified publisher icon oracle

Duplicate history entries due to merge commits

Open jwehler opened this issue 2 years ago • 1 comments

Describe the bug Clicking on History for a file shows duplicate commit entries (same hash) in a git based repository. This appears to be tied to merge commits from one branch (mainline) into the development branch that contains the actual commit. Each time the mainline is merged into the dev branch it results in another entry in OG history. This problem has been around for awhile. I believe it started after the switch to using JGit.

OpenGrok 1.7.35 (Docker)

Screenshots og_merge_commit_history

jwehler avatar Aug 12 '22 00:08 jwehler

So, whenever a merge commit is done, even files that were not changed in that commit receive the extra entry in the history ?

vladak avatar Sep 13 '22 10:09 vladak

I have been seeing this (duplicate history) too for the past few releases. My workaround is to wipe the index/history/etc for the affected repo and reindex. I did not dig much further, but since you mention merge commits cause it I will keep an eye out.

dpsi avatar Sep 28 '22 21:09 dpsi