From 420e402779b9153a9e03007ba54fcd42c35660fc Mon Sep 17 00:00:00 2001 From: Ilya_Shlyakhter Date: Mon, 22 Mar 2021 19:50:27 +0000 Subject: [PATCH 1/4] Added a comment: replacing a locked file with new content --- .../comment_4_8aa708a1bf76e452ef12c35999774791._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/replacing_a_locked_file_without_unlocking_first/comment_4_8aa708a1bf76e452ef12c35999774791._comment diff --git a/doc/forum/replacing_a_locked_file_without_unlocking_first/comment_4_8aa708a1bf76e452ef12c35999774791._comment b/doc/forum/replacing_a_locked_file_without_unlocking_first/comment_4_8aa708a1bf76e452ef12c35999774791._comment new file mode 100644 index 0000000000..19bfa768fe --- /dev/null +++ b/doc/forum/replacing_a_locked_file_without_unlocking_first/comment_4_8aa708a1bf76e452ef12c35999774791._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="Ilya_Shlyakhter" + avatar="http://cdn.libravatar.org/avatar/1647044369aa7747829c38b9dcc84df0" + subject="replacing a locked file with new content" + date="2021-03-22T19:50:25Z" + content=""" +Then I guess [[todo/auto-lock_files_after_one_edit]] isn't needed? +"""]] From 3b748d522b56c18de34e21c3129b788486979e5e Mon Sep 17 00:00:00 2001 From: Ilya_Shlyakhter Date: Mon, 22 Mar 2021 19:58:43 +0000 Subject: [PATCH 2/4] clarified git-annex-unlock docs re: git add --- doc/git-annex-unlock.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git-annex-unlock.mdwn b/doc/git-annex-unlock.mdwn index 9b5051fb55..71b1142c01 100644 --- a/doc/git-annex-unlock.mdwn +++ b/doc/git-annex-unlock.mdwn @@ -20,7 +20,7 @@ The content of an unlocked file is still stored in git-annex, not git, and when you commit modifications to the file, the modifications will also be stored in git-annex, with only the pointer file stored in git. -If you use `git add` to add a file, it will be added in unlocked form from +If you use `git add` to add a file to the annex, it will be added in unlocked form from the beginning. This allows workflows where a file starts out unlocked, is modified as necessary, and is locked once it reaches its final version. From a50071b60f7876a88cafca0fb1488c0a8fe6cd03 Mon Sep 17 00:00:00 2001 From: tomdhunt Date: Mon, 22 Mar 2021 23:35:32 +0000 Subject: [PATCH 3/4] Added a comment --- ..._2dfb5b225ed62c0310ddadb0d83ceb79._comment | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 doc/tips/setup_a_public_repository_on_a_web_site/comment_9_2dfb5b225ed62c0310ddadb0d83ceb79._comment diff --git a/doc/tips/setup_a_public_repository_on_a_web_site/comment_9_2dfb5b225ed62c0310ddadb0d83ceb79._comment b/doc/tips/setup_a_public_repository_on_a_web_site/comment_9_2dfb5b225ed62c0310ddadb0d83ceb79._comment new file mode 100644 index 0000000000..d6b179de1b --- /dev/null +++ b/doc/tips/setup_a_public_repository_on_a_web_site/comment_9_2dfb5b225ed62c0310ddadb0d83ceb79._comment @@ -0,0 +1,55 @@ +[[!comment format=mdwn + username="tomdhunt" + avatar="http://cdn.libravatar.org/avatar/02694633d0fb05bb89f025cf779218a3" + subject="comment 9" + date="2021-03-22T23:35:30Z" + content=""" +``` +[tom@trafalgar clone_test]$ wget http://breitenfeld.lan/annex/.git/config +--2021-03-22 10:23:32-- http://breitenfeld.lan/annex/.git/config +Resolving breitenfeld.lan (breitenfeld.lan)... 192.168.1.241 +Connecting to breitenfeld.lan (breitenfeld.lan)|192.168.1.241|:80... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1064 (1.0K) +Saving to: ‘config’ + +config 100%[========================================================================================================================================>] 1.04K --.-KB/s in 0s + +2021-03-22 10:23:32 (153 MB/s) - ‘config’ saved [1064/1064] + +[tom@trafalgar clone_test]$ file config +config: ASCII text +[tom@trafalgar clone_test]$ git config --list --file config +core.repositoryformatversion=0 +core.filemode=true +core.bare=false +core.logallrefupdates=true +annex.uuid=4ad5f0f5-9b92-475b-9abf-c1845a42c758 +annex.version=8 +annex.dotfiles=true +annex.thin=true +annex.addunlocked=include=torrent-downloads/* +annex.sshcaching=true +filter.annex.smudge=git-annex smudge -- %f +filter.annex.clean=git-annex smudge --clean -- %f +remote.surface.url=ssh://tom@DESKTOP-K1RQ50D/home/tom/bigdata +remote.surface.fetch=+refs/heads/*:refs/remotes/surface/* +remote.surface.annex-uuid=b4b17fe9-4c46-44a9-b6cb-0c2c17904830 +remote.zfsrent2.url=gcrypt::rsync://user@redacted.server.name/rent_data/data/git/bigdata +remote.zfsrent2.fetch=+refs/heads/*:refs/remotes/zfsrent2/* +remote.zfsrent2.gcrypt-participants=BDF1CB2C01162329 +remote.zfsrent2.gcrypt-signingkey=BDF1CB2C01162329 +remote.zfsrent2.gcrypt-publish-participants=true +remote.zfsrent2.gcrypt-id=:id:iSB2By8j7YrAY1Zycx+Q +remote.gnubee.url=gcrypt::rsync://archive@gnubee/data2/bigdata +remote.gnubee.fetch=+refs/heads/*:refs/remotes/gnubee/* +remote.gnubee.gcrypt-participants=BDF1CB2C01162329 +remote.gnubee.gcrypt-signingkey=BDF1CB2C01162329 +remote.gnubee.gcrypt-publish-participants=true +remote.gnubee.gcrypt-id=:id:wAwSE2kqUs9HLuq1usaP +[tom@trafalgar clone_test]$ git remote -v +origin http://breitenfeld.lan/annex/.git/ (fetch) +origin DISABLE (push) +``` +FWIW on the server side the only requests I'm seeing to the .git/config URL are my wget tests, so it seems like git-annex never even gets as far as trying to fetch it. +"""]] From 2ac2cc79c238473cd5e4685bdc34547e0cf2e409 Mon Sep 17 00:00:00 2001 From: Lukey Date: Tue, 23 Mar 2021 07:19:40 +0000 Subject: [PATCH 4/4] Added a comment --- ...mment_10_5554d52c568fdd5235c498ba999545cb._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/tips/setup_a_public_repository_on_a_web_site/comment_10_5554d52c568fdd5235c498ba999545cb._comment diff --git a/doc/tips/setup_a_public_repository_on_a_web_site/comment_10_5554d52c568fdd5235c498ba999545cb._comment b/doc/tips/setup_a_public_repository_on_a_web_site/comment_10_5554d52c568fdd5235c498ba999545cb._comment new file mode 100644 index 0000000000..ef2a0f6d89 --- /dev/null +++ b/doc/tips/setup_a_public_repository_on_a_web_site/comment_10_5554d52c568fdd5235c498ba999545cb._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="Lukey" + avatar="http://cdn.libravatar.org/avatar/c7c08e2efd29c692cc017c4a4ca3406b" + subject="comment 10" + date="2021-03-23T07:19:39Z" + content=""" +I got it. If the server is on a local network, you have to set `annex.security.allowed-ip-addresses` to allow access. + +@joey +Is this intentional for this remote type? If it is, a better error message would be helpful. +"""]]