From a1169e64c79c0a939fda4c3cf609b448c0e52aa6 Mon Sep 17 00:00:00 2001 From: "https://openid.stackexchange.com/user/814e4910-8e9b-4fe5-83ef-ff863c1a7314" Date: Thu, 12 Feb 2015 22:45:28 +0000 Subject: --- doc/forum/root_assistant__63__.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/forum/root_assistant__63__.mdwn (limited to 'doc') diff --git a/doc/forum/root_assistant__63__.mdwn b/doc/forum/root_assistant__63__.mdwn new file mode 100644 index 000000000..54b872944 --- /dev/null +++ b/doc/forum/root_assistant__63__.mdwn @@ -0,0 +1,3 @@ +How safe (or not) is it to run the assistant as root? + +If not safe, what would be a good way to sync directories like /usr/local ? -- cgit v1.2.3 From 7babea254c5598ad0a55349e148ae21425e85ae8 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 13 Feb 2015 00:27:31 +0000 Subject: --- doc/special_remotes/S3.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/special_remotes/S3.mdwn b/doc/special_remotes/S3.mdwn index 59af40e0b..1b816599e 100644 --- a/doc/special_remotes/S3.mdwn +++ b/doc/special_remotes/S3.mdwn @@ -68,4 +68,4 @@ the S3 remote. then use the same bucket. * `x-amz-meta-*` are passed through as http headers when storing keys - in S3. + in S3. see [the Internet Archive S3 interface documentation](https://archive.org/help/abouts3.txt) for example headers. -- cgit v1.2.3 From d2287166c6791fb366106221babee703ebe485e8 Mon Sep 17 00:00:00 2001 From: "5.22.130.32" <5.22.130.32@web> Date: Fri, 13 Feb 2015 10:49:25 +0000 Subject: poll vote (OpenStack SWIFT) --- doc/design/assistant/polls/prioritizing_special_remotes.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn index 3c9de2b02..e62e80233 100644 --- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn +++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn @@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync. Help me prioritize my work: What special remote would you most like to use with the git-annex assistant? -[[!poll open=yes 18 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 10 "Box.com (done)" 74 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 13 "OpenStack SWIFT" 35 "Google Drive"]] +[[!poll open=yes 18 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 10 "Box.com (done)" 74 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 14 "OpenStack SWIFT" 35 "Google Drive"]] This poll is ordered with the options I consider easiest to build listed first. Mostly because git-annex already supports them and they -- cgit v1.2.3 From effc8227aae26f760b781bc4931c6e54ba66ca5c Mon Sep 17 00:00:00 2001 From: "5.22.130.32" <5.22.130.32@web> Date: Fri, 13 Feb 2015 10:49:37 +0000 Subject: poll vote (Tahoe-LAFS) --- doc/design/assistant/polls/prioritizing_special_remotes.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn index e62e80233..42535f94d 100644 --- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn +++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn @@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync. Help me prioritize my work: What special remote would you most like to use with the git-annex assistant? -[[!poll open=yes 18 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 10 "Box.com (done)" 74 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 14 "OpenStack SWIFT" 35 "Google Drive"]] +[[!poll open=yes 18 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 10 "Box.com (done)" 74 "My phone (or MP3 player)" 26 "Tahoe-LAFS" 13 "OpenStack SWIFT" 35 "Google Drive"]] This poll is ordered with the options I consider easiest to build listed first. Mostly because git-annex already supports them and they -- cgit v1.2.3 From d3ff9285da50cb4dd53e3da4da455d6f40d710c2 Mon Sep 17 00:00:00 2001 From: "5.22.130.32" <5.22.130.32@web> Date: Fri, 13 Feb 2015 10:49:45 +0000 Subject: poll vote (Google Drive) --- doc/design/assistant/polls/prioritizing_special_remotes.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn index 42535f94d..03646c5fd 100644 --- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn +++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn @@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync. Help me prioritize my work: What special remote would you most like to use with the git-annex assistant? -[[!poll open=yes 18 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 10 "Box.com (done)" 74 "My phone (or MP3 player)" 26 "Tahoe-LAFS" 13 "OpenStack SWIFT" 35 "Google Drive"]] +[[!poll open=yes 18 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 10 "Box.com (done)" 74 "My phone (or MP3 player)" 25 "Tahoe-LAFS" 13 "OpenStack SWIFT" 36 "Google Drive"]] This poll is ordered with the options I consider easiest to build listed first. Mostly because git-annex already supports them and they -- cgit v1.2.3 From fe48a226d11160dbd8f50b7918adae0914e634bf Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkMTPqZZWoz396ABpx6nh3osxKQCFaSW6M" Date: Fri, 13 Feb 2015 13:55:21 +0000 Subject: Added a comment --- .../comment_8_c44144c677d54aaea6e900d0d7e000a3._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/multiple_urls_for_the_same_UUID/comment_8_c44144c677d54aaea6e900d0d7e000a3._comment (limited to 'doc') diff --git a/doc/forum/multiple_urls_for_the_same_UUID/comment_8_c44144c677d54aaea6e900d0d7e000a3._comment b/doc/forum/multiple_urls_for_the_same_UUID/comment_8_c44144c677d54aaea6e900d0d7e000a3._comment new file mode 100644 index 000000000..f333c2bc0 --- /dev/null +++ b/doc/forum/multiple_urls_for_the_same_UUID/comment_8_c44144c677d54aaea6e900d0d7e000a3._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkMTPqZZWoz396ABpx6nh3osxKQCFaSW6M" + nickname="Mark" + subject="comment 8" + date="2015-02-13T13:55:21Z" + content=""" +Ah, ok. So it doesn't cause any issues that the host/* remote branches will also keep getting swapped from one repository to another? The operation of `git annex sync` is sufficiently (and happily) opaque to me, so I was concerned that this might break some of its basic assumptions. +"""]] -- cgit v1.2.3 From 43d2939ebb4b0a00db17cb6e39c85ed3f8dde2f9 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 13 Feb 2015 15:33:54 +0000 Subject: lookupkey = readlink $ basename? --- doc/forum/optimising_lookupkey.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/forum/optimising_lookupkey.mdwn (limited to 'doc') diff --git a/doc/forum/optimising_lookupkey.mdwn b/doc/forum/optimising_lookupkey.mdwn new file mode 100644 index 000000000..b8e4a0353 --- /dev/null +++ b/doc/forum/optimising_lookupkey.mdwn @@ -0,0 +1,5 @@ +to work around [[forum/original_filename_on_s3/]], i need to get the key from a file, and i'm not within the git-annex process. i know there's `git annex lookupkey $FILE`, but that incurs significant overhead because the whole git annex runtime needs to fire up. in my tests, this takes around 25ms on average. + +could i optimise this by simply doing a `readlink` call on the git checkout? it sure looks like `readlink | basename` is all I really need, and that can probably be done below 10ms (4ms in my tests). how reliable are those links anyways, and is that what lookupkey does? + +thanks. --[[anarcat]] -- cgit v1.2.3 From 5c0254221e3425779b55df6718a6a789299121ed Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 13 Feb 2015 15:59:46 +0000 Subject: Added a comment: why md5sum? --- .../comment_5_b0cb207a85cda5a0ff2ea71caca22c0d._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/internals/hashing/comment_5_b0cb207a85cda5a0ff2ea71caca22c0d._comment (limited to 'doc') diff --git a/doc/internals/hashing/comment_5_b0cb207a85cda5a0ff2ea71caca22c0d._comment b/doc/internals/hashing/comment_5_b0cb207a85cda5a0ff2ea71caca22c0d._comment new file mode 100644 index 000000000..80db7abcc --- /dev/null +++ b/doc/internals/hashing/comment_5_b0cb207a85cda5a0ff2ea71caca22c0d._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="https://id.koumbit.net/anarcat" + subject="why md5sum?" + date="2015-02-13T15:59:46Z" + content=""" +why the extra processing to generate the hashing directories? + +we already have a hash here, for example, `SHA256E-s8242375--5f82490990812ad3feabb02355750710a9d94283ab256d1c691c3bf8d7d9fbe3.ogg` has a loon `5f82490990812ad3feabb02355750710a9d94283ab256d1c691c3bf8d7d9fbe3` hash. Why not use the first characters of that? This is will not change for a give file, and has a higher chance of generating collisions (which is a good thing here, because we can reuse directories). + +In other words, why aren't the hashes of `SHA256E-s8242375--5f82490990812ad3feabb02355750710a9d94283ab256d1c691c3bf8d7d9fbe3.ogg` simply `5f8/249`? --[[anarcat]] +"""]] -- cgit v1.2.3 From 309d05fa3f01388cc68ad5bdb627590802fed244 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 13 Feb 2015 16:09:18 +0000 Subject: add extra question about cat-file vs find --- doc/forum/optimising_lookupkey.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'doc') diff --git a/doc/forum/optimising_lookupkey.mdwn b/doc/forum/optimising_lookupkey.mdwn index b8e4a0353..5a7da7383 100644 --- a/doc/forum/optimising_lookupkey.mdwn +++ b/doc/forum/optimising_lookupkey.mdwn @@ -2,4 +2,12 @@ to work around [[forum/original_filename_on_s3/]], i need to get the key from a could i optimise this by simply doing a `readlink` call on the git checkout? it sure looks like `readlink | basename` is all I really need, and that can probably be done below 10ms (4ms in my tests). how reliable are those links anyways, and is that what lookupkey does? +similarly, i wonder if it's safe to bypass git-annex and talk straight with git to extract location tracking? i can jump from 90ms to below 10ms for such requests if I turn `git annex find ` into the convoluted: + +
+git annex lookupkey $file
+printf $key | md5sum
+git cat-file -p refs/heads/git-annex:$hash/${key}.log
+
+ thanks. --[[anarcat]] -- cgit v1.2.3 From 060688a5579c5242325097013f2b5ab310c455b0 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 13 Feb 2015 18:59:54 +0000 Subject: --- doc/bugs/weird_entry_in_process_list.mdwn | 39 +++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 doc/bugs/weird_entry_in_process_list.mdwn (limited to 'doc') diff --git a/doc/bugs/weird_entry_in_process_list.mdwn b/doc/bugs/weird_entry_in_process_list.mdwn new file mode 100644 index 000000000..4e09ed306 --- /dev/null +++ b/doc/bugs/weird_entry_in_process_list.mdwn @@ -0,0 +1,39 @@ +### Please describe the problem. + +The standalone linux binaries do not show up as `git-annex` in the process list, but as `ld-linux-x86-64` - it's pretty confusing! + +### What steps will reproduce the problem? + +Install the standalone binaries from downloads.kitenet.net, run git-annex. + +### What version of git-annex are you using? On what operating system? + +Today's snapshot from downloads.k.n. + +### 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 +root@koumbit-mp-test:/var/isuma/media/video# top -b -n 1 | head -10 +top - 14:00:09 up 15 days, 23:25, 4 users, load average: 1.18, 1.26, 1.34 +Tasks: 216 total, 1 running, 213 sleeping, 0 stopped, 2 zombie +Cpu(s): 0.4%us, 0.1%sy, 0.0%ni, 99.3%id, 0.2%wa, 0.0%hi, 0.0%si, 0.0%st +Mem: 6122044k total, 5469364k used, 652680k free, 321080k buffers +Swap: 2928632k total, 0k used, 2928632k free, 4009592k cached + + PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND +28261 root 20 0 4528 652 528 D 79 0.0 0:01.28 ld-linux-x86-64 + 1381 root 20 0 126m 13m 4060 S 2 0.2 190:25.64 Xorg + 1 root 20 0 8356 812 684 S 0 0.0 0:05.50 init +root@koumbit-mp-test:/var/isuma/media/video# ps axf | grep annex + 9861 pts/2 S+ 0:00 | \_ git annex add hd high high~ ipod ipod~ large low mp4_sd raw small wc xlarge + 9862 pts/2 Sl+ 3:50 | \_ /opt/git-annex.linux//lib64/ld-linux-x86-64.so.2 --library-path /opt/git-annex.linux//etc/ld.so.conf.d:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/audit:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/gconv:/opt/git-annex.linux//usr/lib:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu:/opt/git-annex.linux//lib64:/opt/git-annex.linux//lib/x86_64-linux-gnu: /opt/git-annex.linux/shimmed/git-annex/git-annex add hd high high~ ipod ipod~ large low mp4_sd raw small wc xlarge + 9878 pts/2 S+ 0:00 | \_ /opt/git-annex.linux//lib64/ld-linux-x86-64.so.2 --library-path /opt/git-annex.linux//etc/ld.so.conf.d:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/audit:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/gconv:/opt/git-annex.linux//usr/lib:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu:/opt/git-annex.linux//lib64:/opt/git-annex.linux//lib/x86_64-linux-gnu: /opt/git-annex.linux/shimmed/git/git --git-dir=.git --work-tree=. check-attr -z --stdin annex.backend annex.numcopies -- + 9881 pts/2 S+ 0:01 | \_ /opt/git-annex.linux//lib64/ld-linux-x86-64.so.2 --library-path /opt/git-annex.linux//etc/ld.so.conf.d:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/audit:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/gconv:/opt/git-annex.linux//usr/lib:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu:/opt/git-annex.linux//lib64:/opt/git-annex.linux//lib/x86_64-linux-gnu: /opt/git-annex.linux/shimmed/git/git --git-dir=.git --work-tree=. cat-file --batch + 9882 pts/2 S+ 0:00 | \_ /opt/git-annex.linux//lib64/ld-linux-x86-64.so.2 --library-path /opt/git-annex.linux//etc/ld.so.conf.d:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/audit:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/gconv:/opt/git-annex.linux//usr/lib:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu:/opt/git-annex.linux//lib64:/opt/git-annex.linux//lib/x86_64-linux-gnu: /opt/git-annex.linux/shimmed/git/git --git-dir=.git --work-tree=. cat-file --batch +28293 pts/2 R+ 0:00 | \_ /opt/git-annex.linux//lib64/ld-linux-x86-64.so.2 --library-path /opt/git-annex.linux//etc/ld.so.conf.d:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/audit:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu/gconv:/opt/git-annex.linux//usr/lib:/opt/git-annex.linux//usr/lib/x86_64-linux-gnu:/opt/git-annex.linux//lib64:/opt/git-annex.linux//lib/x86_64-linux-gnu: /opt/git-annex.linux/shimmed/sha256sum/sha256sum .git/annex/misctmp/videonew9862 +# End of transcript or log. +"""]] + +couldn't it alter its process name to make this a little more intuitive? --[[anarcat]] -- cgit v1.2.3 From 455635546a08ed6c053f411d88f777d6e852a520 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 13 Feb 2015 19:03:57 +0000 Subject: --- doc/bugs/weird_entry_in_process_list.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/weird_entry_in_process_list.mdwn b/doc/bugs/weird_entry_in_process_list.mdwn index 4e09ed306..e09ad8140 100644 --- a/doc/bugs/weird_entry_in_process_list.mdwn +++ b/doc/bugs/weird_entry_in_process_list.mdwn @@ -36,4 +36,4 @@ root@koumbit-mp-test:/var/isuma/media/video# ps axf | grep annex # End of transcript or log. """]] -couldn't it alter its process name to make this a little more intuitive? --[[anarcat]] +couldn't it alter its process name to make this a little more intuitive? This is especially problematic because i am trying to hook git-annex into Puppet and Facter, which require me to guess where the various git-annex repos are on the server. The way i was doing that so far was with `lsof -c 'git-annex' -F0tn`, which is obviously failing under those circumstances.... Unless there's a better way to find those repos across the system? I assume there's a git-annex assistant running here... --[[anarcat]] -- cgit v1.2.3 From 8eeb62950413365c587865089789f21b35e84224 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnT7et8wPkEerW4yk_dJ2kgNijKvgzVm9Q" Date: Fri, 13 Feb 2015 23:39:17 +0000 Subject: --- ..._WebApps_GPG___34__create_encrypted_new_repo__34__.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/todo/Display_fingerprint_to_WebApps_GPG___34__create_encrypted_new_repo__34__.mdwn (limited to 'doc') diff --git a/doc/todo/Display_fingerprint_to_WebApps_GPG___34__create_encrypted_new_repo__34__.mdwn b/doc/todo/Display_fingerprint_to_WebApps_GPG___34__create_encrypted_new_repo__34__.mdwn new file mode 100644 index 000000000..146b0622b --- /dev/null +++ b/doc/todo/Display_fingerprint_to_WebApps_GPG___34__create_encrypted_new_repo__34__.mdwn @@ -0,0 +1,14 @@ + I'm using git-annex 5.20150205-gbf9058a and just used the WebApp to create a new remote SSH repo, and thought I'd try the encrypted option. + +It give me three GPG keys to choose from (all valid keys) but only displayed the email addresses which were all identical so I couldn't tell which was which. + +I then clicked the first key selection button, hoping it would display more info but it seemed to start doing things immediately. It requested the GPG passphrase which I cancelled but it was still doing things, and worse it wasn't clear what state the repo was in (encrypted or not), so I deleted it and started again (it's fine now). + +The passphrase dialog box does display the key fingerprint, but it's then too late to alter the key selection. + +Request: Could the WebApp always display the fingerprint after the email address? + +Some clarity on what happens when you cancel would be nice too. + +Thanks +Giovanni -- cgit v1.2.3 From 0677b24451ccee73e807e4b71e886a0295740229 Mon Sep 17 00:00:00 2001 From: "https://openid.stackexchange.com/user/814e4910-8e9b-4fe5-83ef-ff863c1a7314" Date: Fri, 13 Feb 2015 23:58:48 +0000 Subject: Added a comment: push fails --- ...ent_2_2c275c12cb9254ba3f3570f160bb57d5._comment | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/bare_repositories/comment_2_2c275c12cb9254ba3f3570f160bb57d5._comment (limited to 'doc') diff --git a/doc/bare_repositories/comment_2_2c275c12cb9254ba3f3570f160bb57d5._comment b/doc/bare_repositories/comment_2_2c275c12cb9254ba3f3570f160bb57d5._comment new file mode 100644 index 000000000..156e5f4e6 --- /dev/null +++ b/doc/bare_repositories/comment_2_2c275c12cb9254ba3f3570f160bb57d5._comment @@ -0,0 +1,25 @@ +[[!comment format=mdwn + username="https://openid.stackexchange.com/user/814e4910-8e9b-4fe5-83ef-ff863c1a7314" + nickname="BehemothTheCat" + subject="push fails" + date="2015-02-13T23:58:48Z" + content=""" +These instructions don't work for me, unfortunately. This step: + +git push origin master git-annex + +results in: + +To ssh://my.server.com/home/itz/git/annex.git + ! [rejected] git-annex -> git-annex (non-fast-forward) +error: failed to push some refs to 'ssh://ahiker.mooo.com/home/itz/git/annex.git' +hint: Updates were rejected because a pushed branch tip is behind its remote +hint: counterpart. Check out this branch and integrate the remote changes +hint: (e.g. 'git pull ...') before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + +Versions: git 1:1.9.1-1~bpo70+2 , git-annex 5.20141024~bpo70+1 (both packaged by Debian). + +(And yes, I did do a pull on master first. Maybe I need to do a pull on git-annex as well? Since that's stepping into magic territory, I'm afraid to do so without clear instruction.) + +"""]] -- cgit v1.2.3 From fbaaacaf7fce6a706d4a5b7fb14e4e92d1949d1e Mon Sep 17 00:00:00 2001 From: "https://openid.stackexchange.com/user/814e4910-8e9b-4fe5-83ef-ff863c1a7314" Date: Sat, 14 Feb 2015 00:01:09 +0000 Subject: removed --- ...ent_2_2c275c12cb9254ba3f3570f160bb57d5._comment | 25 ---------------------- 1 file changed, 25 deletions(-) delete mode 100644 doc/bare_repositories/comment_2_2c275c12cb9254ba3f3570f160bb57d5._comment (limited to 'doc') diff --git a/doc/bare_repositories/comment_2_2c275c12cb9254ba3f3570f160bb57d5._comment b/doc/bare_repositories/comment_2_2c275c12cb9254ba3f3570f160bb57d5._comment deleted file mode 100644 index 156e5f4e6..000000000 --- a/doc/bare_repositories/comment_2_2c275c12cb9254ba3f3570f160bb57d5._comment +++ /dev/null @@ -1,25 +0,0 @@ -[[!comment format=mdwn - username="https://openid.stackexchange.com/user/814e4910-8e9b-4fe5-83ef-ff863c1a7314" - nickname="BehemothTheCat" - subject="push fails" - date="2015-02-13T23:58:48Z" - content=""" -These instructions don't work for me, unfortunately. This step: - -git push origin master git-annex - -results in: - -To ssh://my.server.com/home/itz/git/annex.git - ! [rejected] git-annex -> git-annex (non-fast-forward) -error: failed to push some refs to 'ssh://ahiker.mooo.com/home/itz/git/annex.git' -hint: Updates were rejected because a pushed branch tip is behind its remote -hint: counterpart. Check out this branch and integrate the remote changes -hint: (e.g. 'git pull ...') before pushing again. -hint: See the 'Note about fast-forwards' in 'git push --help' for details. - -Versions: git 1:1.9.1-1~bpo70+2 , git-annex 5.20141024~bpo70+1 (both packaged by Debian). - -(And yes, I did do a pull on master first. Maybe I need to do a pull on git-annex as well? Since that's stepping into magic territory, I'm afraid to do so without clear instruction.) - -"""]] -- cgit v1.2.3 From be530fd7d43010cae67115a47e3f6110c6085ef5 Mon Sep 17 00:00:00 2001 From: "https://openid.stackexchange.com/user/814e4910-8e9b-4fe5-83ef-ff863c1a7314" Date: Sat, 14 Feb 2015 00:11:40 +0000 Subject: Added a comment: push fails --- ...ent_2_c88216da0588562c851c2ceabbfebc0a._comment | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment (limited to 'doc') diff --git a/doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment b/doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment new file mode 100644 index 000000000..435040703 --- /dev/null +++ b/doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment @@ -0,0 +1,28 @@ +[[!comment format=mdwn + username="https://openid.stackexchange.com/user/814e4910-8e9b-4fe5-83ef-ff863c1a7314" + nickname="BehemothTheCat" + subject="push fails" + date="2015-02-14T00:11:40Z" + content=""" +These instructions don't work for me, unfortunately. + +This step: + + git push origin master git-annex + +results in: + + To ssh://my.server.com/home/itz/git/annex.git + ! [rejected] git-annex -> git-annex (non-fast-forward) + error: failed to push some refs to 'ssh://my.server.com/home/itz/git/annex.git' + hint: Updates were rejected because a pushed branch tip is behind its remote + hint: counterpart. Check out this branch and integrate the remote changes + hint: (e.g. 'git pull ...') before pushing again. + hint: See the 'Note about fast-forwards' in 'git push --help' for details. + +Versions: git 1:1.9.1-1~bpo70+2 , git-annex 5.20141024~bpo70+1 (both packaged by Debian, same on local and remote) + +And yes, I did a pull on the master branch first. Afraid to do anything +with the git-annex branch without explicit instruction. + +"""]] -- cgit v1.2.3 From 2d9b2449459ae2c355ed494118188a35dfc537b1 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlf4ieXPGMui4AAiAyuzpzqaR1k3guzEHI" Date: Sat, 14 Feb 2015 01:25:04 +0000 Subject: --- ...o_git-annex_folders_on_the_same_filesystem.mdwn | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/forum/Asymmetrical_behavior_between_two_git-annex_folders_on_the_same_filesystem.mdwn (limited to 'doc') diff --git a/doc/forum/Asymmetrical_behavior_between_two_git-annex_folders_on_the_same_filesystem.mdwn b/doc/forum/Asymmetrical_behavior_between_two_git-annex_folders_on_the_same_filesystem.mdwn new file mode 100644 index 000000000..b7ece1cff --- /dev/null +++ b/doc/forum/Asymmetrical_behavior_between_two_git-annex_folders_on_the_same_filesystem.mdwn @@ -0,0 +1,24 @@ +On a shared workstation / server, I have the following directories: + +``` +~thing1/Projects/BerkeleyX +~thing2/BerkeleyX +``` + +`git annex list` works fine as `thing1` from the repo in `~thing2`. But the reverse demands the password for the SSH key coming from `~thing2` as `thing2`. + +More specifically the following "Just Works (tm)": + +``` +sudo su dav +cd ~/Projects/BerkeleyX +git annex list +``` + +but the following asks for an SSH key password, and then doesn't work. + +``` +sudo su dillon +cd ~/BerkeleyX +git annex list +``` -- cgit v1.2.3 From c1f6635b2d24ed92937f2e57ad3867c323301774 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlf4ieXPGMui4AAiAyuzpzqaR1k3guzEHI" Date: Sat, 14 Feb 2015 01:28:18 +0000 Subject: removed --- ...o_git-annex_folders_on_the_same_filesystem.mdwn | 24 ---------------------- 1 file changed, 24 deletions(-) delete mode 100644 doc/forum/Asymmetrical_behavior_between_two_git-annex_folders_on_the_same_filesystem.mdwn (limited to 'doc') diff --git a/doc/forum/Asymmetrical_behavior_between_two_git-annex_folders_on_the_same_filesystem.mdwn b/doc/forum/Asymmetrical_behavior_between_two_git-annex_folders_on_the_same_filesystem.mdwn deleted file mode 100644 index b7ece1cff..000000000 --- a/doc/forum/Asymmetrical_behavior_between_two_git-annex_folders_on_the_same_filesystem.mdwn +++ /dev/null @@ -1,24 +0,0 @@ -On a shared workstation / server, I have the following directories: - -``` -~thing1/Projects/BerkeleyX -~thing2/BerkeleyX -``` - -`git annex list` works fine as `thing1` from the repo in `~thing2`. But the reverse demands the password for the SSH key coming from `~thing2` as `thing2`. - -More specifically the following "Just Works (tm)": - -``` -sudo su dav -cd ~/Projects/BerkeleyX -git annex list -``` - -but the following asks for an SSH key password, and then doesn't work. - -``` -sudo su dillon -cd ~/BerkeleyX -git annex list -``` -- cgit v1.2.3 From b1d9432e0651131a7c0bbeb7b09f8d4b12e61234 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sun, 15 Feb 2015 05:03:21 +0000 Subject: Added a comment: spurious changes in metadata.db --- .../comment_1_b0ef346eaab9ff616aa1ba6b5f4530bc._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/tips/Git_annex_and_Calibre/comment_1_b0ef346eaab9ff616aa1ba6b5f4530bc._comment (limited to 'doc') diff --git a/doc/tips/Git_annex_and_Calibre/comment_1_b0ef346eaab9ff616aa1ba6b5f4530bc._comment b/doc/tips/Git_annex_and_Calibre/comment_1_b0ef346eaab9ff616aa1ba6b5f4530bc._comment new file mode 100644 index 000000000..7636b7702 --- /dev/null +++ b/doc/tips/Git_annex_and_Calibre/comment_1_b0ef346eaab9ff616aa1ba6b5f4530bc._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="https://id.koumbit.net/anarcat" + subject="spurious changes in metadata.db" + date="2015-02-15T05:03:20Z" + content=""" +note that metadata.db seems to change even though no change was performed on the library. i filed a [bug report upstream](https://bugs.launchpad.net/calibre/+bug/1422058) to try and figure out what is going on here. -- [[anarcat]] +"""]] -- cgit v1.2.3 From 5fa10e9bccef4c7f6d83ff5ca86d9573506f5d0e Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sun, 15 Feb 2015 05:40:10 +0000 Subject: add explanations about undo and a confusing thing that bit me (hopefully i got this right) --- doc/direct_mode.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'doc') diff --git a/doc/direct_mode.mdwn b/doc/direct_mode.mdwn index bd0cb81a0..436207ee5 100644 --- a/doc/direct_mode.mdwn +++ b/doc/direct_mode.mdwn @@ -104,6 +104,23 @@ command run on that work tree, and then updating the real work tree to reflect any changes staged or committed by the git command, with appropriate handling of the direct mode files. +## undoing changes in direct mode + +There is also the `undo` command to do the equivalent of the above revert in a simpler way. Say you made a change in direct mode, the assistant dutifully committed it and you realise your mistake, you can try: + + git annex undo file + +to revert the last committed change to `file` in direct mode. Note that if the file is marked as modified and *not* committed, this may not do what you expect and may very well revert the *previous* change to that file! So first check if the file is actually committed: + + $ git annex status file # check if the file was committed + M file + $ # uh-oh, not running the assistant or the file wasn't added! + $ git annex add file # make sure we commit the working copy so we revert *that* + $ git annex status file # look how that change is now committed + $ git annex undo file # okay, good to go, now we're reverting to the previous version + +If you would have skipped that `git annex add`, above, you would have revert to the version *before* the version that was before the modified version! In other words, two versions before! + ## forcing git to use the work tree in direct mode This is for experts only. You can lose data doing this, or check enormous -- cgit v1.2.3 From 46354c1423e7e1180a84d64780b928127f29fcdb Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sun, 15 Feb 2015 05:40:58 +0000 Subject: --- doc/todo/direct_mode_undo.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/direct_mode_undo.mdwn b/doc/todo/direct_mode_undo.mdwn index 926222d97..82c2e4ab8 100644 --- a/doc/todo/direct_mode_undo.mdwn +++ b/doc/todo/direct_mode_undo.mdwn @@ -84,3 +84,5 @@ that touched files in that directory, and undo the changes to those files. Also, --depth could make undo look for an older commit than the most recent one to affect the specified file. + +See [[direct_mode]] for documentation about this feature. -- cgit v1.2.3 From e81a8c4cb715ab0a7655636d9285c75de73b4d15 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sun, 15 Feb 2015 05:42:50 +0000 Subject: mention --dept --- doc/direct_mode.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/direct_mode.mdwn b/doc/direct_mode.mdwn index 436207ee5..215f5da8f 100644 --- a/doc/direct_mode.mdwn +++ b/doc/direct_mode.mdwn @@ -119,7 +119,7 @@ to revert the last committed change to `file` in direct mode. Note that if the f $ git annex status file # look how that change is now committed $ git annex undo file # okay, good to go, now we're reverting to the previous version -If you would have skipped that `git annex add`, above, you would have revert to the version *before* the version that was before the modified version! In other words, two versions before! +If you would have skipped that `git annex add`, above, you would have revert to the version *before* the version that was before the modified version! In other words, two versions before! Note that you can use the `--depth` flag to revert even earlier versions of the file. ## forcing git to use the work tree in direct mode -- cgit v1.2.3 From 41f14f0522e213e01883973902e4a52e96752b8d Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sun, 15 Feb 2015 05:46:01 +0000 Subject: Added a comment --- .../comment_1_bd7e9f152805a57cce97bef64e4891dd._comment | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/todo/direct_mode_undo/comment_1_bd7e9f152805a57cce97bef64e4891dd._comment (limited to 'doc') diff --git a/doc/todo/direct_mode_undo/comment_1_bd7e9f152805a57cce97bef64e4891dd._comment b/doc/todo/direct_mode_undo/comment_1_bd7e9f152805a57cce97bef64e4891dd._comment new file mode 100644 index 000000000..35e1b90b0 --- /dev/null +++ b/doc/todo/direct_mode_undo/comment_1_bd7e9f152805a57cce97bef64e4891dd._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="https://id.koumbit.net/anarcat" + subject="comment 1" + date="2015-02-15T05:46:01Z" + content=""" +> This way, if a file has a staged change, it gets committed, and then that commit is reverted, resulting in another commit. Which a later run of undo can in turn revert. If it didn't commit, the history about the staged change that was reverted would be lost. + +so far, my experience with this is that unstaged changes get dropped and the change that gets undoed is the last committed change. In other words, if i have: + + $ git annex status + M file + +`git annex undo` is going to drop that modification and `git revert HEAD`. but maybe i got confused, in which care some of the documentation i just did in [[direct mode]] needs to be corrected. --[[anarcat]] +"""]] -- cgit v1.2.3 From 42977075e5e964ae4c483f14291cefa22f743d50 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sun, 15 Feb 2015 05:49:35 +0000 Subject: hmm... seems like undo respects unstaged changes after all, ohwell --- doc/direct_mode.mdwn | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'doc') diff --git a/doc/direct_mode.mdwn b/doc/direct_mode.mdwn index 215f5da8f..d22c2ba5e 100644 --- a/doc/direct_mode.mdwn +++ b/doc/direct_mode.mdwn @@ -110,16 +110,7 @@ There is also the `undo` command to do the equivalent of the above revert in a s git annex undo file -to revert the last committed change to `file` in direct mode. Note that if the file is marked as modified and *not* committed, this may not do what you expect and may very well revert the *previous* change to that file! So first check if the file is actually committed: - - $ git annex status file # check if the file was committed - M file - $ # uh-oh, not running the assistant or the file wasn't added! - $ git annex add file # make sure we commit the working copy so we revert *that* - $ git annex status file # look how that change is now committed - $ git annex undo file # okay, good to go, now we're reverting to the previous version - -If you would have skipped that `git annex add`, above, you would have revert to the version *before* the version that was before the modified version! In other words, two versions before! Note that you can use the `--depth` flag to revert even earlier versions of the file. +to revert the last change to `file`. Note that you can use the `--depth` flag to revert earlier versions of the file. ## forcing git to use the work tree in direct mode -- cgit v1.2.3 From 5f244cc51263e2a09c1af1a7f49374920e7dcc03 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sun, 15 Feb 2015 05:52:03 +0000 Subject: Added a comment: sigh... nevermind --- .../comment_2_b826160420e0f343aadc5353e50aed2b._comment | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 doc/todo/direct_mode_undo/comment_2_b826160420e0f343aadc5353e50aed2b._comment (limited to 'doc') diff --git a/doc/todo/direct_mode_undo/comment_2_b826160420e0f343aadc5353e50aed2b._comment b/doc/todo/direct_mode_undo/comment_2_b826160420e0f343aadc5353e50aed2b._comment new file mode 100644 index 000000000..1f300b881 --- /dev/null +++ b/doc/todo/direct_mode_undo/comment_2_b826160420e0f343aadc5353e50aed2b._comment @@ -0,0 +1,17 @@ +[[!comment format=mdwn + username="https://id.koumbit.net/anarcat" + subject="sigh... nevermind" + date="2015-02-15T05:52:02Z" + content=""" +seems like i was wrong. i could have sworn i saw a committed file get unstaged. what i saw was: + + $ git annex status + M file + $ git annex undo file + $ git annex status + ? file + +the thing is: the file was *removed* in a previous version, so i thought this was what it reverted to. i'm unsure as to why the file was marked as missing there - i ended up reverting from a backup (from another remote, by hand). after trying to reproduce this, i failed, so there may have been some PEBKAC in action again. + +this feature is so useful though, thanks for this. --[[anarcat]] +"""]] -- cgit v1.2.3 From 97d8dd05c0fd059d18fa35265e4acb366c61afe9 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Sun, 15 Feb 2015 05:52:58 +0000 Subject: Added a comment: undo to the rescue --- .../comment_2_9e8122ea81bbd0a86bd6c5173db801f8._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/tips/Git_annex_and_Calibre/comment_2_9e8122ea81bbd0a86bd6c5173db801f8._comment (limited to 'doc') diff --git a/doc/tips/Git_annex_and_Calibre/comment_2_9e8122ea81bbd0a86bd6c5173db801f8._comment b/doc/tips/Git_annex_and_Calibre/comment_2_9e8122ea81bbd0a86bd6c5173db801f8._comment new file mode 100644 index 000000000..de485fb73 --- /dev/null +++ b/doc/tips/Git_annex_and_Calibre/comment_2_9e8122ea81bbd0a86bd6c5173db801f8._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="https://id.koumbit.net/anarcat" + subject="undo to the rescue" + date="2015-02-15T05:52:58Z" + content=""" +note: to avoid having too many such changes, i end up using [[todo/direct_mode_undo]] quite often. +"""]] -- cgit v1.2.3 From 0fcec70d546e301ebd96ada1e403ab801a395fd3 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkWHj0RxNMfuwvFzo2d-V6vBKOYwW_Fnfk" Date: Sun, 15 Feb 2015 13:35:02 +0000 Subject: --- ..._to_preserve_history:_--all_not_recognised.mdwn | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 doc/forum/Using_standard_groups_and_sync_to_preserve_history:_--all_not_recognised.mdwn (limited to 'doc') diff --git a/doc/forum/Using_standard_groups_and_sync_to_preserve_history:_--all_not_recognised.mdwn b/doc/forum/Using_standard_groups_and_sync_to_preserve_history:_--all_not_recognised.mdwn new file mode 100644 index 000000000..f191503e3 --- /dev/null +++ b/doc/forum/Using_standard_groups_and_sync_to_preserve_history:_--all_not_recognised.mdwn @@ -0,0 +1,33 @@ +My copy of *git-annex* refuses to sync all, namely when I try it I get the following error + + $ git annex sync --content --all + git-annex: unrecognized option `--all' + + Usage: git-annex sync [REMOTE ...] [option ...] + --content also transfer file contents + + To see additional options common to all commands, run: git annex help options + +This contradicts the advice on [preferred content](http://git-annex.branchable.com/preferred_content/) set out under **difference: unused**, +and I cannot see any other options in my man page that would address the lack of this option. + +The problem I am trying to solve is that I wish to preserve all history on the backup drives. Namely, if I do the following + + touch test-of-annex-backup.txt + git annex add test-of-annex-backup.txt + git commit --message='test: Create empty test-of-annex-backup.txt file' + git annex edit test-of-annex-backup.txt + echo "This line creates version 2 of this file" > test-of-annex-backup.txt + git annex add test-of-annex-backup.txt + git commit --message='test: Create version 2 of test-of-annex-backup.txt' + git annex sync --content --all + +I expect to see 2 copies of `test-of-annex-backup.txt` be copied to each accessible annex repository in the `backup` group + +I tried googling for `"git annex sync --content --all"`, but I only find pages telling me that this is what I should use, and none saying the option has been deprecated. + +I am very confused, as this seems to me an almost stereotypical use of *git-annex*, and yet I cannot see how to do it + +thanks + +Andrew -- cgit v1.2.3 From fb2a96d9f7bc96517dd51efdcb99ef04c49b841b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawldTFGlKsKUyq6F6CJ22CNBnmYJ0LQbLUQ" Date: Mon, 16 Feb 2015 10:00:29 +0000 Subject: --- ...erminated_add_of_huge_picture_folder__63__.mdwn | 76 ++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn (limited to 'doc') diff --git a/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn b/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn new file mode 100644 index 000000000..a6667c887 --- /dev/null +++ b/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn @@ -0,0 +1,76 @@ +Step by step: + +git annex add ./hugePictureFolder +// no it's to big and taking to long, let's not do this +CRTL+D +git drop --force ./hugePictureFolder +git status +fatal: bad default revision 'HEAD' +git reset --hard git-annex +git status // ok +ls +drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 000 +drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 001 +drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 002 +drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 003 +drwxr-xr-x 6 rolas rolas 4096 Vas 16 11:40 004 +drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 005 +drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 006 +drwxr-xr-x 13 rolas rolas 4096 Vas 16 11:40 007 +drwxr-xr-x 6 rolas rolas 4096 Vas 16 11:40 008 +drwxr-xr-x 13 rolas rolas 4096 Vas 16 11:40 009 +drwxr-xr-x 14 rolas rolas 4096 Vas 16 11:40 00a +drwxr-xr-x 16 rolas rolas 4096 Vas 16 11:40 00b +drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 00c +drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 00d +drwxr-xr-x 20 rolas rolas 4096 Vas 16 11:40 00e +drwxr-xr-x 18 rolas rolas 4096 Vas 16 11:40 00f +drwxr-xr-x 14 rolas rolas 4096 Vas 16 11:40 010 +drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 011 +drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 012 +drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 013 +drwxr-xr-x 7 rolas rolas 4096 Vas 16 11:40 014 +drwxr-xr-x 16 rolas rolas 4096 Vas 16 11:40 015 +drwxr-xr-x 7 rolas rolas 4096 Vas 16 11:40 016 +drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 017 +drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 018 +drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 019 +drwxr-xr-x 8 rolas rolas 4096 Vas 16 11:40 01a +drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 01b +drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 01c +drwxr-xr-x 8 rolas rolas 4096 Vas 16 11:40 01d +drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 01e +drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 01f +drwxr-xr-x 15 rolas rolas 4096 Vas 16 11:40 020 +drwxr-xr-x 13 rolas rolas 4096 Vas 16 11:40 021 +drwxr-xr-x 5 rolas rolas 4096 Vas 16 11:40 022 +drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 023 +drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 024 +drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 025 +drwxr-xr-x 8 rolas rolas 4096 Vas 16 11:40 026 +drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 027 +drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 028 +drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 029 +drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 02a +drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 02b +drwxr-xr-x 6 rolas rolas 4096 Vas 16 11:40 02c +drwxr-xr-x 7 rolas rolas 4096 Vas 16 11:40 02d +drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 02e +drwxr-xr-x 5 rolas rolas 4096 Vas 16 11:40 02f +drwxr-xr-x 13 rolas rolas 4096 Vas 16 11:40 030 +drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 031 +drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 032 +... +... + +What did I Do? Can I do CTRL+D? If yes, what should I do to recover? + +Thanks + +$ git --version +git version 2.3.0 + +$ git annex version +git-annex version: 5.20140412ubuntu1 + + -- cgit v1.2.3 From 251341a622c2ca771d04b0dc87df2e1a3b70defe Mon Sep 17 00:00:00 2001 From: BojanNikolic Date: Mon, 16 Feb 2015 10:04:41 +0000 Subject: Added a comment: Publishing using rsync/directory layout --- .../comment_2_27a40806d009d617b3ad56873197bf87._comment | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/tips/publishing_your_files_to_the_public/comment_2_27a40806d009d617b3ad56873197bf87._comment (limited to 'doc') diff --git a/doc/tips/publishing_your_files_to_the_public/comment_2_27a40806d009d617b3ad56873197bf87._comment b/doc/tips/publishing_your_files_to_the_public/comment_2_27a40806d009d617b3ad56873197bf87._comment new file mode 100644 index 000000000..9cca4e2fa --- /dev/null +++ b/doc/tips/publishing_your_files_to_the_public/comment_2_27a40806d009d617b3ad56873197bf87._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="BojanNikolic" + subject="Publishing using rsync/directory layout" + date="2015-02-16T10:04:41Z" + content=""" +Is it possible to easily do the same with rsync/directory layout of the special remote? These have prefixes which are not shown when doing git annex lookupkey +"""]] -- cgit v1.2.3 From d506c2e64c7864d827e2a41fc667d95bdc6ff1f1 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawldTFGlKsKUyq6F6CJ22CNBnmYJ0LQbLUQ" Date: Mon, 16 Feb 2015 10:06:41 +0000 Subject: --- ...erminated_add_of_huge_picture_folder__63__.mdwn | 146 ++++++++++----------- 1 file changed, 73 insertions(+), 73 deletions(-) (limited to 'doc') diff --git a/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn b/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn index a6667c887..9099fde08 100644 --- a/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn +++ b/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn @@ -1,76 +1,76 @@ Step by step: -git annex add ./hugePictureFolder -// no it's to big and taking to long, let's not do this -CRTL+D -git drop --force ./hugePictureFolder -git status -fatal: bad default revision 'HEAD' -git reset --hard git-annex -git status // ok -ls -drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 000 -drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 001 -drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 002 -drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 003 -drwxr-xr-x 6 rolas rolas 4096 Vas 16 11:40 004 -drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 005 -drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 006 -drwxr-xr-x 13 rolas rolas 4096 Vas 16 11:40 007 -drwxr-xr-x 6 rolas rolas 4096 Vas 16 11:40 008 -drwxr-xr-x 13 rolas rolas 4096 Vas 16 11:40 009 -drwxr-xr-x 14 rolas rolas 4096 Vas 16 11:40 00a -drwxr-xr-x 16 rolas rolas 4096 Vas 16 11:40 00b -drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 00c -drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 00d -drwxr-xr-x 20 rolas rolas 4096 Vas 16 11:40 00e -drwxr-xr-x 18 rolas rolas 4096 Vas 16 11:40 00f -drwxr-xr-x 14 rolas rolas 4096 Vas 16 11:40 010 -drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 011 -drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 012 -drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 013 -drwxr-xr-x 7 rolas rolas 4096 Vas 16 11:40 014 -drwxr-xr-x 16 rolas rolas 4096 Vas 16 11:40 015 -drwxr-xr-x 7 rolas rolas 4096 Vas 16 11:40 016 -drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 017 -drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 018 -drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 019 -drwxr-xr-x 8 rolas rolas 4096 Vas 16 11:40 01a -drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 01b -drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 01c -drwxr-xr-x 8 rolas rolas 4096 Vas 16 11:40 01d -drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 01e -drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 01f -drwxr-xr-x 15 rolas rolas 4096 Vas 16 11:40 020 -drwxr-xr-x 13 rolas rolas 4096 Vas 16 11:40 021 -drwxr-xr-x 5 rolas rolas 4096 Vas 16 11:40 022 -drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 023 -drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 024 -drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 025 -drwxr-xr-x 8 rolas rolas 4096 Vas 16 11:40 026 -drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 027 -drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 028 -drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 029 -drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 02a -drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 02b -drwxr-xr-x 6 rolas rolas 4096 Vas 16 11:40 02c -drwxr-xr-x 7 rolas rolas 4096 Vas 16 11:40 02d -drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 02e -drwxr-xr-x 5 rolas rolas 4096 Vas 16 11:40 02f -drwxr-xr-x 13 rolas rolas 4096 Vas 16 11:40 030 -drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 031 -drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 032 -... -... - -What did I Do? Can I do CTRL+D? If yes, what should I do to recover? - -Thanks - -$ git --version -git version 2.3.0 - -$ git annex version -git-annex version: 5.20140412ubuntu1 - +git annex add ./hugePictureFolder
+// no it's to big and taking to long, let's not do this
+CRTL+D
+git annex --force drop ./hugePictureFolder
+git status
+fatal: bad default revision 'HEAD'
+git reset --hard git-annex
+git status // ok
+ls
+drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 000
+drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 001
+drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 002
+drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 003
+drwxr-xr-x 6 rolas rolas 4096 Vas 16 11:40 004
+drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 005
+drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 006
+drwxr-xr-x 13 rolas rolas 4096 Vas 16 11:40 007
+drwxr-xr-x 6 rolas rolas 4096 Vas 16 11:40 008
+drwxr-xr-x 13 rolas rolas 4096 Vas 16 11:40 009
+drwxr-xr-x 14 rolas rolas 4096 Vas 16 11:40 00a
+drwxr-xr-x 16 rolas rolas 4096 Vas 16 11:40 00b
+drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 00c
+drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 00d
+drwxr-xr-x 20 rolas rolas 4096 Vas 16 11:40 00e
+drwxr-xr-x 18 rolas rolas 4096 Vas 16 11:40 00f
+drwxr-xr-x 14 rolas rolas 4096 Vas 16 11:40 010
+drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 011
+drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 012
+drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 013
+drwxr-xr-x 7 rolas rolas 4096 Vas 16 11:40 014
+drwxr-xr-x 16 rolas rolas 4096 Vas 16 11:40 015
+drwxr-xr-x 7 rolas rolas 4096 Vas 16 11:40 016
+drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 017
+drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 018
+drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 019
+drwxr-xr-x 8 rolas rolas 4096 Vas 16 11:40 01a
+drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 01b
+drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 01c
+drwxr-xr-x 8 rolas rolas 4096 Vas 16 11:40 01d
+drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 01e
+drwxr-xr-x 11 rolas rolas 4096 Vas 16 11:40 01f
+drwxr-xr-x 15 rolas rolas 4096 Vas 16 11:40 020
+drwxr-xr-x 13 rolas rolas 4096 Vas 16 11:40 021
+drwxr-xr-x 5 rolas rolas 4096 Vas 16 11:40 022
+drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 023
+drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 024
+drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 025
+drwxr-xr-x 8 rolas rolas 4096 Vas 16 11:40 026
+drwxr-xr-x 12 rolas rolas 4096 Vas 16 11:40 027
+drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 028
+drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 029
+drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 02a
+drwxr-xr-x 9 rolas rolas 4096 Vas 16 11:40 02b
+drwxr-xr-x 6 rolas rolas 4096 Vas 16 11:40 02c
+drwxr-xr-x 7 rolas rolas 4096 Vas 16 11:40 02d
+drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 02e
+drwxr-xr-x 5 rolas rolas 4096 Vas 16 11:40 02f
+drwxr-xr-x 13 rolas rolas 4096 Vas 16 11:40 030
+drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 031
+drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 032
+...
+...
+
+What did I Do? Can I do CTRL+D? If yes, what should I do to recover?
+
+Thanks
+
+$ git --version
+git version 2.3.0
+
+$ git annex version
+git-annex version: 5.20140412ubuntu1
+
-- cgit v1.2.3 From 474c2a07739a54b254069eee5d7549d880377c9d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawldTFGlKsKUyq6F6CJ22CNBnmYJ0LQbLUQ" Date: Mon, 16 Feb 2015 10:08:15 +0000 Subject: --- .../What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn b/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn index 9099fde08..8bcc1dc78 100644 --- a/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn +++ b/doc/forum/What_happens_after_terminated_add_of_huge_picture_folder__63__.mdwn @@ -66,6 +66,7 @@ drwxr-xr-x 10 rolas rolas 4096 Vas 16 11:40 032
What did I Do? Can I do CTRL+D? If yes, what should I do to recover?

Thanks
+Rolandas

$ git --version
git version 2.3.0
-- cgit v1.2.3 From 17bb71240e0a41292e3ec236934891c56432f46c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnwNDA50ZupMvOgpgDqzDRyu5B-mYlVwa4" Date: Mon, 16 Feb 2015 17:32:32 +0000 Subject: Added a comment --- .../comment_8_e8890ec39415140d9d9448e5dd67a7ff._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_8_e8890ec39415140d9d9448e5dd67a7ff._comment (limited to 'doc') diff --git a/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_8_e8890ec39415140d9d9448e5dd67a7ff._comment b/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_8_e8890ec39415140d9d9448e5dd67a7ff._comment new file mode 100644 index 000000000..7539e9b1f --- /dev/null +++ b/doc/bugs/git_annex_direct_-__62___rename:_does_not_exist/comment_8_e8890ec39415140d9d9448e5dd67a7ff._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnwNDA50ZupMvOgpgDqzDRyu5B-mYlVwa4" + nickname="Andreas" + subject="comment 8" + date="2015-02-16T17:32:32Z" + content=""" +Sorry, missed the link. The recent version from the tarball fixes the issue for me. +"""]] -- cgit v1.2.3 From 169ba45f3c732fa49c26a09c2dfee5d0388b276a Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Mon, 16 Feb 2015 20:33:03 +0000 Subject: fix link --- doc/special_remotes/directory.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/special_remotes/directory.mdwn b/doc/special_remotes/directory.mdwn index 6279024ec..5584f31f3 100644 --- a/doc/special_remotes/directory.mdwn +++ b/doc/special_remotes/directory.mdwn @@ -6,7 +6,7 @@ you want to use to sneakernet files between systems (possibly with the drive's mountpoint as a directory remote. Note that directory remotes have a special directory structure -(by design, the same as the \[[rsync|rsync]] remote). +(by design, the same as the [[rsync|rsync]] remote). If you just want two copies of your repository with the files "visible" in the tree in both, the directory special remote is not what you want. Instead, you should use a regular `git clone` of your git-annex repository. -- cgit v1.2.3