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

6 files changed, 49 insertions, 31 deletions

diff --git a/doc/bugs/documentation_typo_in_git_annex_find.mdwn b/doc/bugs/documentation_typo_in_git_annex_find.mdwn
deleted file mode 100644
index cee770d3ac..0000000000
--- a/doc/bugs/documentation_typo_in_git_annex_find.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-### Please describe the problem.
-
-`git annex find --help` incorrectly documents `--copies REMOTE`, the REMOTE should be NUMBER.
-
-### What steps will reproduce the problem?
-
-`git annex find --help | grep -- --copies`
-
-### What version of git-annex are you using? On what operating system?
-
-10.20240129
-
-### 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 awesome, was always awesome and will always be awesome.  I appreciate all the work going into it.
diff --git a/doc/bugs/documentation_typo_in_git_annex_find/comment_1_afb7c20d07eb58647d0dba265ee31998._comment b/doc/bugs/documentation_typo_in_git_annex_find/comment_1_afb7c20d07eb58647d0dba265ee31998._comment
deleted file mode 100644
index 93961e05b3..0000000000
--- a/doc/bugs/documentation_typo_in_git_annex_find/comment_1_afb7c20d07eb58647d0dba265ee31998._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="nobodyinperson"
- avatar="http://cdn.libravatar.org/avatar/736a41cd4988ede057bae805d000f4f5"
- subject="Everyone can fix typos in the docs"
- date="2024-04-18T05:21:42Z"
- content="""
-Btw you can edit the documentation yourself, just click the EDIT button at the top of the page.
-"""]]
diff --git a/doc/bugs/documentation_typo_in_git_annex_find/comment_2_13a5aa9163d1fd392bf52484c6eb4d90._comment b/doc/bugs/documentation_typo_in_git_annex_find/comment_2_13a5aa9163d1fd392bf52484c6eb4d90._comment
deleted file mode 100644
index 6a411ba391..0000000000
--- a/doc/bugs/documentation_typo_in_git_annex_find/comment_2_13a5aa9163d1fd392bf52484c6eb4d90._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="ErrGe"
- avatar="http://cdn.libravatar.org/avatar/37423d3bfd69af2cda23d194ec74f991"
- subject="but I'm talking about --help, isn't that in the source code?"
- date="2024-04-18T13:07:40Z"
- content="""
-I'm talking about the output of a --help command, that has to be in the source code somewhere, no?
-"""]]
diff --git a/doc/forum/Cheapest_test_for_an_initialized_annex__63__.mdwn b/doc/forum/Cheapest_test_for_an_initialized_annex__63__.mdwn
new file mode 100644
index 0000000000..86cfef9200
--- /dev/null
+++ b/doc/forum/Cheapest_test_for_an_initialized_annex__63__.mdwn
@@ -0,0 +1,11 @@
+I need to implement some functionality that should work in similar ways when faced with a plain Git vs a git-annex repo. In this context I am looking for the cheapest of the appropriate tests for an initialized annex?
+
+I have looked at
+
+- `git config annex.uuid` (~3ms)
+- `git rev-parse git-annex` (~3ms)
+- `git annex info --fast -q` (~50ms)
+
+Are  the fast ones sufficient to guarantee that no subsequent call to a git-annex command would yield `git-annex: First run: git-annex init`?
+
+Thanks!
diff --git a/doc/forum/Cheapest_test_for_an_initialized_annex__63__/comment_1_abe1af7fc49f91e3aa15915190dc5dfd._comment b/doc/forum/Cheapest_test_for_an_initialized_annex__63__/comment_1_abe1af7fc49f91e3aa15915190dc5dfd._comment
new file mode 100644
index 0000000000..688829b314
--- /dev/null
+++ b/doc/forum/Cheapest_test_for_an_initialized_annex__63__/comment_1_abe1af7fc49f91e3aa15915190dc5dfd._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="aurtzy"
+ avatar="http://cdn.libravatar.org/avatar/7d44f9b718a534ada04551ee8c72e07f"
+ subject="comment 1"
+ date="2024-04-25T17:35:49Z"
+ content="""
+`git config annex.uuid` seems reliable enough to me - the uuid is stored in `.git/config` and doesn't exist if it's not annex-inited (assuming no malicious behavior).
+
+If you're looking for the very cheapest, perhaps something like a file-exists check on `.git/annex` would work? I don't know if there are any edge cases with this one, though.
+"""]]
diff --git a/doc/todo/__91__PATCH__93___Change_--copies__39___meta_parameter_to_NUMBER.mdwn b/doc/todo/__91__PATCH__93___Change_--copies__39___meta_parameter_to_NUMBER.mdwn
new file mode 100644
index 0000000000..c36e928a31
--- /dev/null
+++ b/doc/todo/__91__PATCH__93___Change_--copies__39___meta_parameter_to_NUMBER.mdwn
@@ -0,0 +1,28 @@
+There is a documentation issue with `--copies` (e.g. used in `git annex find`), parameter should be a number, not a remote.
+
+```
+From dc8c177efcfdd82f62ae1d49a7b1276774a4fbc3 Mon Sep 17 00:00:00 2001
+From: Gergely Risko <errge@nilcons.com>
+Date: Mon, 22 Apr 2024 17:32:06 +0200
+Subject: [PATCH] Change --copies' meta parameter to NUMBER
+
+---
+ CmdLine/GitAnnex/Options.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs
+index 694b60d240..07cf54069e 100644
+--- a/CmdLine/GitAnnex/Options.hs
++++ b/CmdLine/GitAnnex/Options.hs
+@@ -298,7 +298,7 @@ keyMatchingOptions' =
+ 		<> completeRemotes
+ 		)
+ 	, annexOption (setAnnexState . Limit.addCopies) $ strOption
+-		( long "copies" <> short 'C' <> metavar paramRemote
++		( long "copies" <> short 'C' <> metavar paramNumber
+ 		<> help "skip files with fewer copies"
+ 		<> hidden
+ 		)
+-- 
+2.43.0
+```