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 2021-08-18 15:17:56 -04:00
commit ea675c4747
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 118 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
doc/bugs/commit_f0754a61f_needs_a_fix_to_build_on_Windows.mdwn Normal file
View file

@ -0,0 +1,84 @@
### Please describe the problem.
Git-annex commit f0754a61f doesn't compile on Windows without a small patch.
### What steps will reproduce the problem?
`stack setup && stack build`
### What version of git-annex are you using? On what operating system?
[[!format sh """
git-annex version: 8.20210804-gf0754a61f
build flags: Assistant Webapp Pairing TorrentParser Feeds Testsuite S3 WebDAV
dependency versions: aws-0.22 bloomfilter-2.0.1.0 cryptonite-0.26 DAV-1.3.4 feed-1.3.0.1 ghc-8.8.4 http-client-0.6.4.1 persistent-sqlite-2.10.6.2 torrent-10000.1.1 uuid-1.3.13 yesod-1.6.1.0
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL X*
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs httpalso borg hook external
operating system: mingw32 x86_64
supported repository versions: 8
upgrade supported from repository versions: 2 3 4 5 6 7
"""]]
Windows 10 version 21H1 (build 19043.1165), 64 bit.
### Please provide any additional information below.
Relevant parts of the build log:
[[!format sh """
jkniiv@AINESIS MINGW64 /c/annx
$ tail -n 25 /c/Projektit/git-annex.branchable.com/git-annex--BUILD-210817-f0754a61f/stack.build.LOG~102
[343 of 665] Compiling Annex.CheckIgnore
[344 of 665] Compiling Annex.CheckAttr
[345 of 665] Compiling Backend
[346 of 665] Compiling Annex.Verify
Annex\Verify.hs:129:22: error:
Not in scope: `S.hGetSome'
No module named `S' is imported.
|
129 | b <- S.hGetSome h chunk
| ^^^^^^^^^^
Annex\Verify.hs:130:20: error:
Not in scope: `S.null'
No module named `S' is imported.
|
130 | if S.null b
| ^^^^^^
-- While building package git-annex-8.20210803 (scroll up to its section to see the error) using:
C:\Users\jkniiv\Projektit\git-annex.branchable.com\git-annex--BUILD-210817-f0754a61f\.stack-work\dist\29cc6475\setup\setup --builddir=.stack-work\dist\29cc6475 build exe:git-annex --ghc-options " -fdiagnostics-color=always"
Process exited with code: ExitFailure 1
# End of transcript.
"""]]
The change I made was with an import, as follows:
[[!format diff """
diff --git a/Annex/Verify.hs b/Annex/Verify.hs
index c41a793f6..ad9866800 100644
--- a/Annex/Verify.hs
+++ b/Annex/Verify.hs
@@ -33,9 +33,9 @@ import Types.WorkerPool
import Types.Key
import Control.Concurrent.STM
+import qualified Data.ByteString as S
#if WITH_INOTIFY
import qualified System.INotify as INotify
-import qualified Data.ByteString as S
import qualified System.FilePath.ByteString as P
#endif
"""]]
This then compiled cleanly and completed the test suite ok.
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Git Annex is great. It works quite nicely with my multi-gigabyte backup files (largest around 180GB) via the BLAKE2B160E backend :)

22
doc/forum/File_still_symlinked_after_git_annex_unannex.mdwn Normal file
View file

@ -0,0 +1,22 @@
So I'm about 5 minutes into using git-annex and I've already messed it up :-p.
My intent is to get a working `.gitattributes` file that automatically uses annex for `git add` on image files such as RW2 (Panasonic RAW files) and regular git for `git add` on non-image files (especially in this case XMP sidecar files). So I set that up seemingly successfully. I did `git add P1000252.RW2` and it seemed to create a symlink in the annex folder. Then I figured I'd try using it a bit like I do with normal git, unstaging it before committing (note that I've made zero commits so far in this repo). That looked like it worked, at least in terms of `git status` and `git annex status`. However now I'm at a point where the file is untracked in git and a question mark in `git annex status` (presumably untracked as well), yet the file is still a symlink to the annex folder. I ran `git annex unannex` on the file and still it's a symlink.
What I expected was that it would just go back to a regular file in its previous location instead of a symlink. Did I do something wrong? How do I "recover" from this, just manually move the file back in place and change the mode on it? Luckily this repo was just a test with some junk files so recovery of this particular file isn't critical, I just don't want to end up messing up my huge photo library going forward.
Further breaking my brain right now is that on `git init` it used branch `main` and continued showing me as being on branch `main` throughout all this. But `git branch` only showed the branch `git-annex`. So I tried checking out this `git-annex` branch, and it says it switched to the branch. Then I tried checking out `main` again but I get `pathspec 'main' did not match any file(s) known to git`.
Version:
```
git-annex version: 8.20210803
build flags: Assistant Webapp Pairing Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite S3 WebDAV
dependency versions: aws-0.22 bloomfilter-2.0.1.0 cryptonite-0.29 DAV-1.3.4 feed-1.3.2.0 ghc-8.10.4 http-client-0.6.4.1 persistent-sqlite-2.13.0.3 torrent-10000.1.1 uuid-1.3.15 yesod-1.6.1.2
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL X*
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs httpalso borg hook external
operating system: linux x86_64
supported repository versions: 8
upgrade supported from repository versions: 0 1 2 3 4 5 6 7
local repository version: 8
```
Side note, and maybe this is something you hear a lot and hate hearing, but having the code, docs, and issues on a site like GitLab or GitHub would be a big improvement IMO.

12
doc/forum/File_still_symlinked_after_git_annex_unannex/comment_1_55f1a5f16fe2f8a85034a85c5450bad2._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="Austin"
avatar="http://cdn.libravatar.org/avatar/5954e64a0ca016dd371f3110f7acd7a9"
subject="comment 1"
date="2021-08-18T06:28:39Z"
content="""
Naturally not long after I posted I found something that helped: http://git-annex.branchable.com/forum/git_annex_add_crash_and_subsequent_recovery/#comment-4f5af644597a055624009c5bbb9aca3f
Somewhat unintuitively `git add P1000252.RW2` then `git annex unannex P1000252.RW2` got the file back to its previous location.
I'm still feeling odd about the branch situation, but I think it may be this problem: https://git-annex.branchable.com/forum/Is_git-annex_in_a_precarious_state_before_the_initial_commit__63__/
"""]]