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

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2022-09-22 12:59:53 -04:00
commit a9355e74a3
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 136 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/Incorrect___34__file_content_has_changed__34___on_duplicates/comment_8_37eb9d35191bcfc0e7e4496f5720cbed._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="jgoerzen"
avatar="http://cdn.libravatar.org/avatar/090740822c9dcdb39ffe506b890981b4"
subject="comment 8"
date="2022-09-22T03:40:04Z"
content="""
Thank you!
"""]]

33
doc/bugs/reports_file___34__modified__34___whenever_it_is_not/comment_6_48819ddcb8713087c78db8941e4c1151._comment Normal file
View file

@ -0,0 +1,33 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 6"
date="2022-09-22T01:03:18Z"
content="""
may be it one of those options, in my case - it is just a straight `get` on that single unlocked file:
```
(dandisets) dandi@drogon:/mnt/backup/dandi/dandisets/000026$ git status
On branch draft
Your branch is up to date with 'github/draft'.
nothing to commit, working tree clean
(dandisets) dandi@drogon:/mnt/backup/dandi/dandisets/000026$ cat .dandi/assets.json
/annex/objects/SHA256E-s69507227--6a0a91c4158d316ab8ad9bd8ebf7579b9c3c579e1035c48134246b6a5d2f6f14.json
(dandisets) dandi@drogon:/mnt/backup/dandi/dandisets/000026$ git annex get .dandi/assets.json
get .dandi/assets.json (from dandi-dandisets-dropbox...)
(checksum...) ok
(recording state in git...)
(dandisets) dandi@drogon:/mnt/backup/dandi/dandisets/000026$ git status
On branch draft
Your branch is up to date with 'github/draft'.
Changes not staged for commit:
(use \"git add <file>...\" to update what will be committed)
(use \"git restore <file>...\" to discard changes in working directory)
modified: .dandi/assets.json
no changes added to commit (use \"git add\" and/or \"git commit -a\")
```
"""]]

58
doc/bugs/reports_file___34__modified__34___whenever_it_is_not/comment_7_3186ec45f20c4d768c7682e1d42fa24c._comment Normal file
View file

@ -0,0 +1,58 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 7"
date="2022-09-22T01:33:24Z"
content="""
sorry I have not mentioned your [earlier comment 4](http://git-annex.branchable.com/bugs/reports_file___34__modified__34___whenever_it_is_not/#comment-ca0281ff580c91c40e429fbbb71a3791) but my clarification above I think gives the answers to your questions ;)
<details>
<summary>FWIW here is the get --debug output </summary>
```shell
[2022-09-21 21:29:59.904218] (Utility.Process) process [3968193] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"ls-files\",\"--stage\",\"-z\",\"--error-unmatch\",\"--\",\".dandi/assets.json\"]
[2022-09-21 21:29:59.904725] (Utility.Process) process [3968194] chat: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"cat-file\",\"--batch-check=%(objectname) %(objecttype) %(objectsize)\",\"--buffer\"]
[2022-09-21 21:29:59.905645] (Utility.Process) process [3968195] chat: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"cat-file\",\"--batch=%(objectname) %(objecttype) %(objectsize)\",\"--buffer\"]
[2022-09-21 21:29:59.906012] (Utility.Process) process [3968196] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"show-ref\",\"git-annex\"]
[2022-09-21 21:29:59.907578] (Utility.Process) process [3968196] done ExitSuccess
[2022-09-21 21:29:59.907891] (Utility.Process) process [3968197] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"]
[2022-09-21 21:29:59.913611] (Utility.Process) process [3968197] done ExitSuccess
[2022-09-21 21:29:59.914676] (Utility.Process) process [3968198] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"log\",\"refs/heads/git-annex..5f5efa8544ff02c9261dd1590425dcea37a55526\",\"--pretty=%H\",\"-n1\"]
[2022-09-21 21:29:59.916707] (Utility.Process) process [3968198] done ExitSuccess
[2022-09-21 21:29:59.916968] (Utility.Process) process [3968199] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"log\",\"refs/heads/git-annex..18497e6e9cab7754a85256416c361fee36ba65b2\",\"--pretty=%H\",\"-n1\"]
[2022-09-21 21:29:59.918722] (Utility.Process) process [3968199] done ExitSuccess
[2022-09-21 21:29:59.919069] (Utility.Process) process [3968200] chat: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"cat-file\",\"--batch=%(objectname) %(objecttype) %(objectsize)\",\"--buffer\"]
get .dandi/assets.json [2022-09-21 21:29:59.921463] (Utility.Process) process [3968202] chat: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"cat-file\",\"--batch\"]
(from dandi-dandisets-dropbox...) [2022-09-21 21:29:59.931525] (Utility.Process) process [3968203] chat: /home/dandi/miniconda3/envs/dandisets/bin/git-annex [\"transferrer\",\"-c\",\"annex.debug=true\"]
[2022-09-21 21:29:59.93162] (Annex.TransferrerPool) > d rdandi-dandisets-dropbox SHA256E-s69507227--6a0a91c4158d316ab8ad9bd8ebf7579b9c3c579e1035c48134246b6a5d2f6f14.json .dandi/assets.json
[2022-09-21 21:29:59.942599] (Annex.TransferrerPool) < opb
[2022-09-21 21:29:59.942718] (Annex.TransferrerPool) < ops 69507227
[2022-09-21 21:30:03.103409] (Annex.TransferrerPool) < ope
[2022-09-21 21:30:03.103539] (Annex.TransferrerPool) < om (checksum...)
(checksum...) [2022-09-21 21:30:03.768599] (Annex.TransferrerPool) < t
[2022-09-21 21:30:03.768843] (Annex.Branch) read 6e0/a70/SHA256E-s69507227--6a0a91c4158d316ab8ad9bd8ebf7579b9c3c579e1035c48134246b6a5d2f6f14.json.log
[2022-09-21 21:30:03.770259] (Annex.Branch) set 6e0/a70/SHA256E-s69507227--6a0a91c4158d316ab8ad9bd8ebf7579b9c3c579e1035c48134246b6a5d2f6f14.json.log
ok
[2022-09-21 21:30:03.770361] (Utility.Process) process [3968200] done ExitSuccess
[2022-09-21 21:30:03.770425] (Utility.Process) process [3968195] done ExitSuccess
[2022-09-21 21:30:03.770484] (Utility.Process) process [3968194] done ExitSuccess
[2022-09-21 21:30:03.770531] (Utility.Process) process [3968193] done ExitSuccess
[2022-09-21 21:30:03.771187] (Utility.Process) process [3968452] chat: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"hash-object\",\"-w\",\"--stdin-paths\",\"--no-filters\"]
[2022-09-21 21:30:03.77319] (Utility.Process) process [3968453] feed: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"update-index\",\"-z\",\"--index-info\"]
[2022-09-21 21:30:04.063182] (Utility.Process) process [3968453] done ExitSuccess
[2022-09-21 21:30:04.063779] (Utility.Process) process [3968463] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"]
[2022-09-21 21:30:04.065352] (Utility.Process) process [3968463] done ExitSuccess
(recording state in git...)
[2022-09-21 21:30:04.06587] (Utility.Process) process [3968464] read: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"write-tree\"]
[2022-09-21 21:30:04.407935] (Utility.Process) process [3968464] done ExitSuccess
[2022-09-21 21:30:04.408528] (Utility.Process) process [3968468] chat: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"commit-tree\",\"56c62dcc21145201f9454a2dd6e75cc37f072ee4\",\"--no-gpg-sign\",\"-p\",\"refs/heads/git-annex\"]
[2022-09-21 21:30:04.410591] (Utility.Process) process [3968468] done ExitSuccess
[2022-09-21 21:30:04.413623] (Utility.Process) process [3968469] call: git [\"--git-dir=.git\",\"--work-tree=.\",\"--literal-pathspecs\",\"-c\",\"annex.debug=true\",\"update-ref\",\"refs/heads/git-annex\",\"c3a1f9208649b47621b1424b055bd9871aa2fc79\"]
[2022-09-21 21:30:04.415318] (Utility.Process) process [3968469] done ExitSuccess
[2022-09-21 21:30:04.416301] (Utility.Process) process [3968202] done ExitSuccess
[2022-09-21 21:30:04.416574] (Utility.Process) process [3968452] done ExitSuccess
[2022-09-21 21:30:06.373343] (Utility.Process) process [3968203] done ExitFailure 1
```
</details>
"""]]

29
doc/forum/Not_enough_free_space/comment_7_7cf8cf6d15324b840336be561423d34b._comment Normal file
View file

@ -0,0 +1,29 @@
[[!comment format=mdwn
username="Gus"
avatar="http://cdn.libravatar.org/avatar/665626c67ab3ee7e842183f6f659e120"
subject="comment 7"
date="2022-09-21T22:30:20Z"
content="""
Greeting, joey. I have not. I am waiting for some quiet free time in which I am well rested, to reduce the possibility of messing things up more. :-)
In the meantime, I am seeing, in my `.git/config`:
```
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
diskreserve = 1000MB
```
I think that reserve is for _git_, not _git-annex_. I may as well start setting that variable. I am using git-annex, in part, because I need to have my stuff spread across multiple media.
Looking at your example output, I am getting a less helpful result. Possibly due to what you explain. However I am concerned with the possibility of your \"to do\" is being too specific. Detecting free disk space is not easy (I also use BTRFS, so I know that!). Maybe transferring / growing more than X GB it would print a warning (that would not interfere with automatic usage)? Or easily rollback that last incomplete file to ensure the metadata and other files write cleanly. Certainly you know better than me what works and what is needed.
By the way, if anyone would be interested in writing a book on git-annex, with all these nice tips, I would buy a copy! (I am also willing to provide feedback for a WIP)
Finally, I would also like to add that, looking once more at the log I can see the file mode change, as you said. I now have confirmation that the suspected _sync_ caused this problem.
Thank you once again for all your help.
"""]]

8
doc/forum/When_--git-dir_is_not_in_--work-tree/comment_2_0c101e5b017f56897599c2cbd37b1754._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="nobodyinperson"
avatar="http://cdn.libravatar.org/avatar/736a41cd4988ede057bae805d000f4f5"
subject="comment 2"
date="2022-09-22T06:24:04Z"
content="""
Thank you joey, you're awesome! 👍
"""]]

13
doc/git-annex-preferred-content/comment_6_ef4fad67d2e2c5044c8134e426c3d086._comment
View file

@ -1,13 +0,0 @@
[[!comment format=mdwn
username="rinomizu5@5ead4c82685c65d7717dbd5591b80425036ae9e3"
nickname="rinomizu5"
avatar="http://cdn.libravatar.org/avatar/62478823018c68821064febcda7e5d4f"
subject="&quot;not inbackend=URL&quot; is failed with parse error"
date="2022-09-21T07:04:55Z"
content="""
I tried the `git annex wanted gin \"not inbackend=URL\"` because I don't want to sync to gin remote if the backend key is a URL. But it failed with a Parse error.
The syntax says `inbackend=name`, but is `URL` not included in this `name`?
Please advise me what to do.
"""]]