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

doc/bugs/Push_to_special_remote_includes_unwanted_files.mdwn

@@ -0,0 +1,26 @@
+### Please describe the problem.
+
+When pushing to a special remote, non-largefiles (Git text files) are not filtered by the wanted setting.
+
+### What steps will reproduce the problem?
+
+Push to a directory special remote with exporttree and importtree set yes. The wanted setting filters largefiles, but all Git text files are included even though some are not included in the filter.
+
+### What version of git-annex are you using? On what operating system?
+
+10.20231130-g0e9bc415882a5e3a285e004cf9f80936e5762a07
+Linux
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
+
+### 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)
+
+

doc/bugs/Request_the_ability_to_specify_pull_commit_message.mdwn

@@ -0,0 +1,26 @@
+### Please describe the problem.
+
+There is no way to specify the commit message used by the pull command.
+
+### What steps will reproduce the problem?
+
+When pulling from a special remote with importtree=yes to get new/modified files, git-annex generates the commit message. It is desired to specify the commit message to describe the content being pulled.
+
+### What version of git-annex are you using? On what operating system?
+
+10.20231130-g0e9bc415882a5e3a285e004cf9f80936e5762a07
+Linux
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
+
+### 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)
+
+

doc/bugs/resolvemerge_fails_when_unlocked_empty_files_exist/comment_5_3b5f7c44de6b17e042adaa77a8bed2f8._comment

@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="aurelien@f0d0a0c7da69eff6badf0464898f0a859f69114d"
+ nickname="aurelien"
+ avatar="http://cdn.libravatar.org/avatar/2cbf28821cf4b36380554c22f0b8b809"
+ subject="comment 5"
+ date="2024-01-14T23:18:43Z"
+ content="""
+I think I have been hit by this bug as well with getting \"fatal: stash failed\" after importing some files and trying to sync.
+
+Indeed, temporarily deactivating filter.annex.process and filter.annex.clean allowed to sync. 
+
+And the problem didn't reappear after so far. 
+Is there a reliable workaround (the bug report seem to have no responses?). 
+
+git version 2.43.0
+git-annex version: 10.20230926-g4ac2758ba589562e427a66437b9fdcd5172357e1
+"""]]

doc/bugs/windows_started_to_FTBFS.mdwn

@@ -0,0 +1,32 @@
+### Please describe the problem.
+
+Spotted today
+
+```
+[695 of 696] Compiling CmdLine.GitAnnex
+runneradmin\AppData\Local\Programs\stack\x86_64-windows\msys2-20221216\mingw64\bin (Win32 error 3): The system cannot find the path specified.
+ghc.exe: addLibrarySearchPath: C:\Users\runneradmin\AppData\Local\Programs\stack\x86_64-windows\msys2-20221216\mingw64\lib (Win32 error 3): The system cannot find the path specified.
+ghc.exe: addLibrarySearchPath: C:\Users\runneradmin\AppData\Local\Programs\stack\x86_64-windows\msys2-20221216\mingw64\bin (Win32 error 3): The system cannot find the path specified.
+ghc.exe: addLibrarySearchPath: C:\Users\runneradmin\AppData\Local\Programs\stack\x86_64-windows\msys2-20221216\mingw64\lib (Win32 error 3): The system cannot find the path specified.
+ghc.exe: addLibrarySearchPath: C:\Users\runneradmin\AppData\Local\Programs\stack\x86_64-windows\msys2-20221216\mingw64\bin (Win32 error 3): The system cannot find the path specified.
+ghc.exe: addLibrarySearchPath: C:\Users\runneradmin\AppData\Local\Programs\stack\x86_64-windows\msys2-20221216\mingw64\lib (Win32 error 3): The system cannot find the path specified.
+ghc.exe: addLibrarySearchPath: C:\Users\runneradmin\AppData\Local\Programs\stack\x86_64-windows\msys2-20221216\mingw64\bin (Win32 error 3): The system cannot find the path specified.
+ghc.exe: addLibrarySearchPath: C:\Users\runneradmin\AppData\Local\Programs\stack\x86_64-windows\msys2-20221216\mingw64\lib (Win32 error 3): The system cannot find the path specified.
+ghc.exe: addLibrarySearchPath: C:\Users\runneradmin\AppData\Local\Programs\stack\x86_64-windows\msys2-20221216\mingw64\bin (Win32 error 3): The system cannot find the path specified.
+ghc.exe: addLibrarySearchPath: C:\Users\runneradmin\AppData\Local\Programs\stack\x86_64-windows\msys2-20221216\mingw64\lib (Win32 error 3): The system cannot find the path specified.
+ghc.exe: addLibrarySearchPath: C:\Users\runneradmin\AppData\Local\Programs\stack\x86_64-windows\msys2-20221216\mingw64\bin (Win32 error 3): The system cannot find the path specified.
+
+Error: [S-7282]
+       Stack failed to execute the build plan.
+       
+       While executing the build plan, Stack encountered the error:
+       
+       [S-7011]
+       While building package git-annex-10.20231227 (scroll up to its section to see the error)
+       using:
+       D:\a\git-annex\git-annex\.stack-work\dist\274b403a\setup\setup --verbose=1 --builddir=.stack-work\dist\274b403a build exe:git-annex --ghc-options ""
+       Process exited with code: ExitFailure 1 
+Error: Process completed with exit code 1.
+```
+
+https://github.com/datalad/git-annex/actions/runs/7516705948/job/20462067511

doc/forum/Initial_macOS_setup_between_two_local_Macs.mdwn

@@ -0,0 +1,32 @@
+I’m trying to start syncing between two Macs. This is my first time trying to use `git-annex`.
+
+I have Mac #1 with macOS v14 Sonoma, which is an Apple Silicon Mac.
+
+Mac #2, an Intel Macs, has macOS v13 Ventura.
+
+I installed `git-annex` via the disk image (dmg) on both. Each computer has version 10.20231228-g181e14467ffee9d198529efb74c38242e51107c3.
+
+On Mac #1, I start “git-annex” by double-clicking on it in the Finder. It starts up the assistant in Safari. I create a starting git-annex repo there, with a path in my macOS user home folder — or at least I *try*, because the progress of loading the page never finishes after many minutes of waiting and no indication of any further progress.
+
+I found that if I quit `git-annex` in Activity Monitor and then re-launch it, I see the `git-annex` repo listed.
+
+From there, I select `git-annex` Assistant > Configuration > Repositories > Local Computer. I input a Secret Phase, click the “Start Pairing” button, and all seems relatively okay. There is a “Pair in progress” notice in the Assistant, with a “Cancel” button.
+
+On Mac #2, I start “git-annex” in the Finder, and it launches in Safari. I create an initial git-annex repo. Again, this never seems to complete.
+
+I quit `git-annex` in Activity Monitor and then re-launch it, I see the git-annex repo listed as I did on Mac #1.
+
+Mac #2 shows the “<me on another computer> is sending a pair request” notice, with a “Respond” button. I click “Respond,” enter the same Secret Phrase, and click “Finish pairing.”
+
+At this point, Assistant on Mac #1 shows “PairListener crashed: failed setting up ssh authorized keys” with a ”Restart Thread” button. Clicking the button does not seem to help.
+
+Here are things I’ve also checked and/or tried:
+
+1. Enabled “Remote Login” (SSH) in System Settings > General > Sharing on each computer. (I did this before any attempts to share any `git-annex` repositories between the two computers.) This is limited to only my macOS user account on both Macs.
+1. macOS Firewall is set to default (i.e. shows up as “Inactive” on both Macs.
+1. Mac #2 is using Little Snitch (an alternative firewall) in “Silent (Allow)” mode. I don’t get any alerts from its app about `git-annex` or `ssh`, and it is set to allow incoming and outbound traffic. Even with Little Snitch in “Alert Mode,” I do not get any information about `git-annex` or `ssh`.
+1. Doing a manual setup without Assistant, using the “walkthrough” instructions. This has always resulting in “Remote origin does not have git-annex installed” errors, which I surmise are due to the `authorized_keys` and `config` settings for SSH, or just needing a more-permissive-than-macOS-defaults SSH setup.
+1. Starting setup with Assistant, then trying to manually fill in the SSH configuration gaps. This means I’m trying to cobble together what I assume should be the `authorized_keys` and `config` settings for SSH manually. I’ve used the `git-annex` man pages and some ChatGPT to try to sort that out. I haven’t sorted this out yet. I also haven’t been able to have Git work over SSH between the two computers for this purpose. While doing this, I noted that Mac #1 didn’t have any SSH changes made by git-annex Assistant — but interestingly, Mac #2 did get at least the `authorized_keys` changes. It is possible if I simplify what was doing manually, I may get better luck. Mac #2 already has an `~/.ssh/config` setup and `~/.ssh/authorized_keys`.
+1. Assistant setup, after adding the “git-annex.app” to the Full Disk Access list in System Settings > Privacy & Security. I quit all `git-annex` processes and restarted the app from the Finder afterwards on both computers. Same results.
+
+I’m at a bit of a loss here. Thanks in advance for any ideas that could help get this going.

doc/special_remotes/rsync.mdwn

@@ -58,4 +58,4 @@ To pass parameters to ssh/rsh, include the parameters after "rsh" or
 "ssh".  For example, to configure ssh to use the private key at
 `/path/to/private/key`:
 
-	git config renote.name.annex-rsync-transport "ssh -i /path/to/private/key"
+	git config remote.name.annex-rsync-transport "ssh -i /path/to/private/key"

doc/submodules/comment_8_8755b0d18c1b013ed0dc121ecfb83360._comment

@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="TTTTAAAx"
+ avatar="http://cdn.libravatar.org/avatar/9edd4b69b9f9fc9b8c1cb8ecd03902d5"
+ subject="comment 8"
+ date="2024-01-15T01:43:28Z"
+ content="""
+> Sounds like you might want to use datalad, which is built around git annex and where submodules are a first-class citizen. 
+
+Thank you for information. I'll try datalad. I considered it for audio and transcription dataset management few years ago. But I didn't use it because datalad using git-annex in it and I already used git-annex for data management. It was seemd to be redundant to me.
+
+I think submodule path detecting can be implemented still and be useful in `git-annex-assist` also.
+"""]]