mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix formatting

Browse source
This commit is contained in:
justin.lebar@7a36fcafc322d9a381e89f08ab6289033c6dde91 2018-07-08 18:55:35 +00:00 • committed by admin
parent 9b2ff32573
commit 34cfa919aa
1 changed files with 32 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/git_fsck_duplicateEntries_errors_when_using_adjusted_branch.mdwn
View file

@ -4,7 +4,6 @@
It's hard to say exactly what created this problem, because you don't see the error immediately after it happens. But I believe all I did was add some files to the repo with the adjusted branch, run `git annex add` (I think), and git annex sync. I believe this is all I did because when I have a remote that is apparently running `git fsck` and is rejecting pushes, and I think I'd pushed to this remote before I did the above.
```
$ git fsck
Checking object directories: 100% (256/256), done.
error in tree 85dfa00afd3a57a2981dfe9c0bf489288a3822ae: duplicateEntries: contains duplicate file entries
@ -15,11 +14,9 @@ error in tree a906491c49fd46cc48a8a8ad2e5c059b9909418d: duplicateEntries: contai
error in tree 45e22b842e07260b464306fd54daaddb00fe8689: duplicateEntries: contains duplicate file entries
error in tree 14a7cd8bc15738a61800485f63664d598fa5e100: duplicateEntries: contains duplicate file entries
[...]
```
What's particularly interesting is that the duplicate objects appear to be the same blobs.
```
$ git ls-tree 7171d50e236e541b03faacb3b7113858a3640c4c
120000 blob 52f9ac67c8e73aa22057ecb5a195ebc51f0df5ea General Clarification.docx
120000 blob 52f9ac67c8e73aa22057ecb5a195ebc51f0df5ea General Clarification.docx
@ -29,14 +26,11 @@ $ git ls-tree 7171d50e236e541b03faacb3b7113858a3640c4c
120000 blob 9c3d92e749e34dd1ec43a2c0b36425ae1ff7b01f Worksheet 2018.pdf
120000 blob 8445929b506f916f885018bb5a4a170f3901b7fb Worksheet 2018.xls
120000 blob 8445929b506f916f885018bb5a4a170f3901b7fb Worksheet 2018.xls
```
We can check systematically:
```
$ git fsck |& grep duplicateEntries | cut -f 4 -d ' ' | xargs git ls-tree | uniq -u
(No output)
```
I see two previous bugs about this but and an open question for more information.
@ -51,7 +45,6 @@ Don't really know, sadly.
Both machines show the following:
```
$ git --version
git version 2.18.0
@ -64,7 +57,6 @@ remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb ta
operating system: darwin x86_64
supported repository versions: 3 5 6
upgrade supported from repository versions: 0 1 2 3 4 5
```
However I just recently ran brew update on the two machines. I don't know what versions of git and git-annex they were running before.