From 494a101eba8bfe08d0194f253644ea3ef2e6f857 Mon Sep 17 00:00:00 2001 From: jnkl Date: Sat, 22 Mar 2025 21:29:19 +0000 Subject: [PATCH 1/8] --- ...t_creates_random_antagonistic_commits.mdwn | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 doc/forum/git_assistant_creates_random_antagonistic_commits.mdwn diff --git a/doc/forum/git_assistant_creates_random_antagonistic_commits.mdwn b/doc/forum/git_assistant_creates_random_antagonistic_commits.mdwn new file mode 100644 index 0000000000..04b050d8bd --- /dev/null +++ b/doc/forum/git_assistant_creates_random_antagonistic_commits.mdwn @@ -0,0 +1,23 @@ +I have a fleet of some headless systems and some desktop machines. In the git tree there are somethimes commits like these. Time between the two commits is always more or less 10 seconds. + + git diff c69f4ffee8d288174abe34db03e572c04bc8ba8b 5aceafda84e2d737a97f1e6b8f647adc6b787789 + diff --git a/Dokumente/Gesamtrechnung.pdf b/Dokumente/Gesamtrechnung.pdf + deleted file mode 100644 + index ace4b282de7..00000000000 + --- a/Dokumente/Gesamtrechnung.pdf + +++ /dev/null + @@ -1 +0,0 @@ + -/annex/objects/SHA256E-s22050--e1551117820028dc66e8c4d2e834857664535a4297ce9649a5cf40f7b9fafc66.pdf + + git diff 5aceafda84e2d737a97f1e6b8f647adc6b787789 d3c6388f50e06a5dfae94cd2431c6b3827cee05a + diff --git a/Dokumente/Gesamtrechnung.pdf b/Dokumente/Gesamtrechnung.pdf + new file mode 100644 + index 00000000000..ace4b282de7 + --- /dev/null + +++ b/Dokumente/Gesamtrechnung.pdf + @@ -0,0 +1 @@ + +/annex/objects/SHA256E-s22050--e1551117820028dc66e8c4d2e834857664535a4297ce9649a5cf40f7b9fafc66.pdf + +Random files (one at a time) on random machines at random times are deleted and instantly recommitted. At least I think it happens randomly. + +What happens here? From 2d9453724d1e0ac234cee2c38adf053352705f09 Mon Sep 17 00:00:00 2001 From: jnkl Date: Sun, 23 Mar 2025 11:20:31 +0000 Subject: [PATCH 2/8] Added a comment --- .../comment_1_d794ccefb4e288b3cfd036d47931009f._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/git_assistant_creates_random_antagonistic_commits/comment_1_d794ccefb4e288b3cfd036d47931009f._comment diff --git a/doc/forum/git_assistant_creates_random_antagonistic_commits/comment_1_d794ccefb4e288b3cfd036d47931009f._comment b/doc/forum/git_assistant_creates_random_antagonistic_commits/comment_1_d794ccefb4e288b3cfd036d47931009f._comment new file mode 100644 index 0000000000..f1781da9ae --- /dev/null +++ b/doc/forum/git_assistant_creates_random_antagonistic_commits/comment_1_d794ccefb4e288b3cfd036d47931009f._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="jnkl" + avatar="http://cdn.libravatar.org/avatar/2ab576f3bf2e0d96b1ee935bb7f33dbe" + subject="comment 1" + date="2025-03-23T11:20:31Z" + content=""" +I looked at the timestamps and these commits could be the result of me doing something (I worked at these times), I don't know what I did to these files though. At least they didn't change (checksum din't change?). +"""]] From b6a0ac99df877a5a14a1ddbc6782c4850c991e22 Mon Sep 17 00:00:00 2001 From: "octvs@17a99a7aaeb0c0e0a2375e14807b138740ba34e9" Date: Mon, 24 Mar 2025 17:56:39 +0000 Subject: [PATCH 3/8] Added a comment: failing with `Operation not petmitted` --- ...omment_8_6082e8893acd99088f56ce06eda8b010._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/special_remotes/adb/comment_8_6082e8893acd99088f56ce06eda8b010._comment diff --git a/doc/special_remotes/adb/comment_8_6082e8893acd99088f56ce06eda8b010._comment b/doc/special_remotes/adb/comment_8_6082e8893acd99088f56ce06eda8b010._comment new file mode 100644 index 0000000000..696d418b2d --- /dev/null +++ b/doc/special_remotes/adb/comment_8_6082e8893acd99088f56ce06eda8b010._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="octvs@17a99a7aaeb0c0e0a2375e14807b138740ba34e9" + nickname="octvs" + avatar="http://cdn.libravatar.org/avatar/e31212348b6392eb67daddf78fadfb1b" + subject="failing with `Operation not petmitted`" + date="2025-03-24T17:56:39Z" + content=""" +I also found the answer on my own. + +The trick was hidden under my redaction. The filenames had special characters which are problematic under Android. Removing them solved the issue. +"""]] From 3cd3be80aff115a808a77b2f4a30a0c8c393375b Mon Sep 17 00:00:00 2001 From: "octvs@17a99a7aaeb0c0e0a2375e14807b138740ba34e9" Date: Mon, 24 Mar 2025 17:56:46 +0000 Subject: [PATCH 4/8] Added a comment: failing with `Operation not petmitted` --- ...omment_9_b1ae4cec6fa01ada5bc88b92228f848b._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/special_remotes/adb/comment_9_b1ae4cec6fa01ada5bc88b92228f848b._comment diff --git a/doc/special_remotes/adb/comment_9_b1ae4cec6fa01ada5bc88b92228f848b._comment b/doc/special_remotes/adb/comment_9_b1ae4cec6fa01ada5bc88b92228f848b._comment new file mode 100644 index 0000000000..63c1e1b173 --- /dev/null +++ b/doc/special_remotes/adb/comment_9_b1ae4cec6fa01ada5bc88b92228f848b._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="octvs@17a99a7aaeb0c0e0a2375e14807b138740ba34e9" + nickname="octvs" + avatar="http://cdn.libravatar.org/avatar/e31212348b6392eb67daddf78fadfb1b" + subject="failing with `Operation not petmitted`" + date="2025-03-24T17:56:46Z" + content=""" +I also found the answer on my own. + +The trick was hidden under my redaction. The filenames had special characters which are problematic under Android. Removing them solved the issue. +"""]] From 75ad64b27cd211a723cc94528c0fa32efb76df81 Mon Sep 17 00:00:00 2001 From: "octvs@17a99a7aaeb0c0e0a2375e14807b138740ba34e9" Date: Mon, 24 Mar 2025 17:56:57 +0000 Subject: [PATCH 5/8] removed --- ...omment_9_b1ae4cec6fa01ada5bc88b92228f848b._comment | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 doc/special_remotes/adb/comment_9_b1ae4cec6fa01ada5bc88b92228f848b._comment diff --git a/doc/special_remotes/adb/comment_9_b1ae4cec6fa01ada5bc88b92228f848b._comment b/doc/special_remotes/adb/comment_9_b1ae4cec6fa01ada5bc88b92228f848b._comment deleted file mode 100644 index 63c1e1b173..0000000000 --- a/doc/special_remotes/adb/comment_9_b1ae4cec6fa01ada5bc88b92228f848b._comment +++ /dev/null @@ -1,11 +0,0 @@ -[[!comment format=mdwn - username="octvs@17a99a7aaeb0c0e0a2375e14807b138740ba34e9" - nickname="octvs" - avatar="http://cdn.libravatar.org/avatar/e31212348b6392eb67daddf78fadfb1b" - subject="failing with `Operation not petmitted`" - date="2025-03-24T17:56:46Z" - content=""" -I also found the answer on my own. - -The trick was hidden under my redaction. The filenames had special characters which are problematic under Android. Removing them solved the issue. -"""]] From 1116eed6f57ecc780f78684c2aee91a9b21fed0a Mon Sep 17 00:00:00 2001 From: nobodyinperson Date: Mon, 24 Mar 2025 18:37:31 +0000 Subject: [PATCH 6/8] Added a comment: only for unlocked files? --- .../comment_2_352d8910c4f31c52731adb8b25066c41._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/git_assistant_creates_random_antagonistic_commits/comment_2_352d8910c4f31c52731adb8b25066c41._comment diff --git a/doc/forum/git_assistant_creates_random_antagonistic_commits/comment_2_352d8910c4f31c52731adb8b25066c41._comment b/doc/forum/git_assistant_creates_random_antagonistic_commits/comment_2_352d8910c4f31c52731adb8b25066c41._comment new file mode 100644 index 0000000000..d0bb5aa4d5 --- /dev/null +++ b/doc/forum/git_assistant_creates_random_antagonistic_commits/comment_2_352d8910c4f31c52731adb8b25066c41._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="nobodyinperson" + avatar="http://cdn.libravatar.org/avatar/736a41cd4988ede057bae805d000f4f5" + subject="only for unlocked files?" + date="2025-03-24T18:37:31Z" + content=""" +I also see this very frequently in our shared family documents folder. Several people having the assistant running. I have a feeling it only happens for unlocked files, suggesting git clean/smudge filter nonsense is causing this. Looks like your files are also unlocked. Do you see any of this with locked files? +"""]] From e2efbed7d2c9bd85e6c6e0fe7e5428afaf950d8e Mon Sep 17 00:00:00 2001 From: kyle Date: Tue, 25 Mar 2025 01:56:20 +0000 Subject: [PATCH 7/8] 10.20250320 build error when assistant is disabled --- ...uild_error_when_assistant_is_disabled.mdwn | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 doc/bugs/10.20250320_build_error_when_assistant_is_disabled.mdwn diff --git a/doc/bugs/10.20250320_build_error_when_assistant_is_disabled.mdwn b/doc/bugs/10.20250320_build_error_when_assistant_is_disabled.mdwn new file mode 100644 index 0000000000..6b3837aed5 --- /dev/null +++ b/doc/bugs/10.20250320_build_error_when_assistant_is_disabled.mdwn @@ -0,0 +1,62 @@ +When building git-annex 10.20250320 under `-f-assistant`, I hit into +the following error: + +``` +[363 of 647] Compiling Annex.ChangedRefs ( Annex/ChangedRefs.hs, /git-annex/dist-newstyle/build/x86_64-linux/ghc-9.8.4/git-annex-10.20250320/build/git-annex/git-annex-tmp/Annex/ChangedRefs.o, /git-annex/dist-newstyle/build/x86_64-linux/ghc-9.8.4/git-annex-10.20250320/build/git-annex/git-annex-tmp/Annex/ChangedRefs.dyn_o ) + +Annex/ChangedRefs.hs:96:48: error: [GHC-83865] + • Couldn't match type ‘OS.ByteString’ with ‘[Char]’ + Expected: FilePath + Actual: System.Posix.ByteString.FilePath.RawFilePath + • In the first argument of ‘watchDir’, namely ‘refdir’ + In the second argument of ‘($)’, namely + ‘watchDir refdir (const False) True hooks id’ + In a stmt of a 'do' block: + h <- liftIO $ watchDir refdir (const False) True hooks id + | +96 | h <- liftIO $ watchDir refdir + | ^^^^^^ +``` + +If I drop the `-f-assistant`, the build completes successfully. + +Alternatively, I was able to keep `-f-assistant` by un-indenting this +block from git-annex.cabal one level: + +``` + if os(linux) + Build-Depends: hinotify (>= 0.3.10) + CPP-Options: -DWITH_INOTIFY + Other-Modules: Utility.DirWatcher.INotify + else + if os(darwin) + Build-Depends: hfsevents + CPP-Options: -DWITH_FSEVENTS + Other-Modules: + Utility.DirWatcher.FSEvents + else + if os(windows) + Build-Depends: Win32-notify + CPP-Options: -DWITH_WIN32NOTIFY + Other-Modules: Utility.DirWatcher.Win32Notify + else + if (! os(solaris) && ! os(gnu) && ! os(linux)) + CPP-Options: -DWITH_KQUEUE + C-Sources: Utility/libkqueue.c + Includes: Utility/libkqueue.h + Other-Modules: Utility.DirWatcher.Kqueue +``` + +I suspect that this is a general issue that anyone compiling without +the assistant feature enabled would encounter. Here are other details +of the setup in case they turn out to be relevant: + + * Alpine Linux v3.21 image [*] with GHC 9.8.4 + () + + * `cabal build` called with these flags: + + - `--enable-executable-static` + - `--ghc-options="-j$n +RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread"` + + Full setup is at . From 42e285c81e31afe3e19941105bf9eef768ff24cc Mon Sep 17 00:00:00 2001 From: jnkl Date: Tue, 25 Mar 2025 07:44:00 +0000 Subject: [PATCH 8/8] Added a comment --- .../comment_3_7e9abea365fd75776bdc6ea30ffb32ac._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/git_assistant_creates_random_antagonistic_commits/comment_3_7e9abea365fd75776bdc6ea30ffb32ac._comment diff --git a/doc/forum/git_assistant_creates_random_antagonistic_commits/comment_3_7e9abea365fd75776bdc6ea30ffb32ac._comment b/doc/forum/git_assistant_creates_random_antagonistic_commits/comment_3_7e9abea365fd75776bdc6ea30ffb32ac._comment new file mode 100644 index 0000000000..157ceedf2e --- /dev/null +++ b/doc/forum/git_assistant_creates_random_antagonistic_commits/comment_3_7e9abea365fd75776bdc6ea30ffb32ac._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="jnkl" + avatar="http://cdn.libravatar.org/avatar/2ab576f3bf2e0d96b1ee935bb7f33dbe" + subject="comment 3" + date="2025-03-25T07:44:00Z" + content=""" +I think you are right. Only unlocked files. +"""]]