git fsck finds duplicate entries

Dominy, Patrick A· May 28, 2019, 21:42 UTC · lore

Hi,
Running git fsck against one of our repositories yields the following:
Error in tree xxxxxxx: duplicateEntries: contains duplicate file entries
 
We are struggling with the best approach to resolve the issue.  We’ve used git replace, which successfully creates the replace reference, but fsck still returns the same duplicate entry error.
The commit that introduced the issue happened some time ago, making going back to the bad commit and replaying the commits a daunting task.
Any suggestions would be much appreciated.
 
Thanks

Ævar Arnfjörð Bjarmason· May 28, 2019, 22:48 UTC · re: Dominy, Patrick A · lore

Re: git fsck finds duplicate entries

On Tue, May 28 2019, Dominy, Patrick A wrote:

Show 7 quoted lines

> Hi,
> Running git fsck against one of our repositories yields the following:
> Error in tree xxxxxxx: duplicateEntries: contains duplicate file entries
>
> We are struggling with the best approach to resolve the issue.  We’ve used git replace, which successfully creates the replace reference, but fsck still returns the same duplicate entry error.
> The commit that introduced the issue happened some time ago, making going back to the bad commit and replaying the commits a daunting task.
> Any suggestions would be much appreciated.

At this point you either rewrite the repository or live with it. To live with it see the fsck.skipList documentation in git-config(1). I.e. you'd whitelist this tree as known-bad.