From 254df802ea1acaf850fb72933fcc7b8c86304fdd Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8" Date: Wed, 16 Jul 2014 20:32:57 +0000 Subject: [PATCH 1/6] Added a comment --- .../comment_10_8fe176691f0f61c15085d3c38f0ea50f._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/bugs/Assistant_merge_loop/comment_10_8fe176691f0f61c15085d3c38f0ea50f._comment diff --git a/doc/bugs/Assistant_merge_loop/comment_10_8fe176691f0f61c15085d3c38f0ea50f._comment b/doc/bugs/Assistant_merge_loop/comment_10_8fe176691f0f61c15085d3c38f0ea50f._comment new file mode 100644 index 0000000000..1826e313a8 --- /dev/null +++ b/doc/bugs/Assistant_merge_loop/comment_10_8fe176691f0f61c15085d3c38f0ea50f._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8" + nickname="Jon Ander" + subject="comment 10" + date="2014-07-16T20:32:57Z" + content=""" +I have two computers with Debian testing (5.20140529) that aren't having the issue, and one with Debian Sid (5.20140709) that is still creating the empty merge commits +"""]] From 46aa10967297493e27508914ed353c448de8897b Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Wed, 16 Jul 2014 20:36:32 +0000 Subject: [PATCH 2/6] Added a comment --- ...omment_11_6e3a78327c0b813415ebf85e298813d4._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/Assistant_merge_loop/comment_11_6e3a78327c0b813415ebf85e298813d4._comment diff --git a/doc/bugs/Assistant_merge_loop/comment_11_6e3a78327c0b813415ebf85e298813d4._comment b/doc/bugs/Assistant_merge_loop/comment_11_6e3a78327c0b813415ebf85e298813d4._comment new file mode 100644 index 0000000000..7823176efc --- /dev/null +++ b/doc/bugs/Assistant_merge_loop/comment_11_6e3a78327c0b813415ebf85e298813d4._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.2" + subject="comment 11" + date="2014-07-16T20:36:32Z" + content=""" +Has the assistant been restarted since git-annex was upgraded to the fixed version? + +Can you post a debug.log? +"""]] From 12b7aea04cf7970492be7f41d3f21c55c47b6cd2 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Wed, 16 Jul 2014 20:41:17 +0000 Subject: [PATCH 3/6] Added a comment --- ...comment_4_a36b35d47472b5db779b0489bf3d4893._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Where_is_the_content__63__/comment_4_a36b35d47472b5db779b0489bf3d4893._comment diff --git a/doc/forum/Where_is_the_content__63__/comment_4_a36b35d47472b5db779b0489bf3d4893._comment b/doc/forum/Where_is_the_content__63__/comment_4_a36b35d47472b5db779b0489bf3d4893._comment new file mode 100644 index 0000000000..69b929810e --- /dev/null +++ b/doc/forum/Where_is_the_content__63__/comment_4_a36b35d47472b5db779b0489bf3d4893._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.2" + subject="comment 4" + date="2014-07-16T20:41:17Z" + content=""" +That warning about text relocations always happens on Android and is not relevant to whatever problem you're having. + +If git-annex status does not print anything else, then it seems you have a git-annex repository in /sdcard/annex. If you entered \"mediashare\" in the webapp, you might have another repository in another location. When you open the webapp, it tells you the location of the repository in the upper-right corner -- \"Repository: $location\" +"""]] From 6b84327b73e6a0ddd39a670595bb8a7fa3b6fd2d Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Wed, 16 Jul 2014 20:51:36 +0000 Subject: [PATCH 4/6] Added a comment --- ...comment_6_edd7d5d5c761ff665840f0ef7bea50c9._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass/comment_6_edd7d5d5c761ff665840f0ef7bea50c9._comment diff --git a/doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass/comment_6_edd7d5d5c761ff665840f0ef7bea50c9._comment b/doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass/comment_6_edd7d5d5c761ff665840f0ef7bea50c9._comment new file mode 100644 index 0000000000..9b28909867 --- /dev/null +++ b/doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass/comment_6_edd7d5d5c761ff665840f0ef7bea50c9._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.2" + subject="comment 6" + date="2014-07-16T20:51:36Z" + content=""" +5.20140421 happens to be the very first version of git-annex to support notifychanges. I forget what bugs that first attempt may have had. Have you tried upgrading the macs to a newer version? + + +"""]] From b72d131c92d1e860b3cad13c3edb244cac569e81 Mon Sep 17 00:00:00 2001 From: divB Date: Wed, 16 Jul 2014 20:54:54 +0000 Subject: [PATCH 5/6] Added a comment --- ..._2faceeaf0d39f82e5d624eae19e4ca53._comment | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 doc/forum/Restricting_SSH_+_supply_key/comment_9_2faceeaf0d39f82e5d624eae19e4ca53._comment diff --git a/doc/forum/Restricting_SSH_+_supply_key/comment_9_2faceeaf0d39f82e5d624eae19e4ca53._comment b/doc/forum/Restricting_SSH_+_supply_key/comment_9_2faceeaf0d39f82e5d624eae19e4ca53._comment new file mode 100644 index 0000000000..8ed240a818 --- /dev/null +++ b/doc/forum/Restricting_SSH_+_supply_key/comment_9_2faceeaf0d39f82e5d624eae19e4ca53._comment @@ -0,0 +1,31 @@ +[[!comment format=mdwn + username="divB" + ip="204.17.143.10" + subject="comment 9" + date="2014-07-16T20:54:54Z" + content=""" +Hi Joey, + +Thanks for taking care about all these Windows troubles (Windows and POSIX is unfortunately a big mess). + +I finally found the issue now and maybe the bug is related to msysgit. I guess you don't know too much about it so I will report to the msysgit folks. + +However, there is still an (easy to fix) \"bug\" related to git-annex I think. I shortly describe the issue and a possible fix: + +1.) As mentioned above, from the 3 git.exe, only the one in \"cmd\" should be called! It seems to be a wrapper for the \"bin\"-version. If the git.exe from \"bin\" is called something with the environment is wrong (e.g., ssh_config can not be found) + +2.) cmd/git.exe is in %PATH% so usually no problem + +3.) However, git-annex-autostart.vbs is in \"bin\" folder. Therefore, when called from there PWD is the \"bin\" folder and when calling \"git.exe\" without absolute path, this overwrites %PATH% because it's the current directory (of course, such behavior does not appear on UNIX). + +4.) Now the git-annex assistant daemon always calls the wrong git.exe resulting in a broken config + + +Short term fix for users: Create a shortcut to git-annex-autostart.vbs and change the working directory to anything else + +Long term fix for git-annex option 1: Do a chdir in the vbs file before calling git. This is not so good because where to? + +Long term fix for git-annex option 2: Just place the vbs files in the parent directory (where \"Git Bash.vbs\" is). This looks like the cleanest solution to me. + + +"""]] From 66834112a5a600ec5e41106c7ab7f3a31f70d0aa Mon Sep 17 00:00:00 2001 From: lex Date: Wed, 16 Jul 2014 21:13:06 +0000 Subject: [PATCH 6/6] Added a comment --- .../comment_1_91ce3dc707ba1ba7c5d9e57e20ffce40._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/devblog/day_198__branching_out/comment_1_91ce3dc707ba1ba7c5d9e57e20ffce40._comment diff --git a/doc/devblog/day_198__branching_out/comment_1_91ce3dc707ba1ba7c5d9e57e20ffce40._comment b/doc/devblog/day_198__branching_out/comment_1_91ce3dc707ba1ba7c5d9e57e20ffce40._comment new file mode 100644 index 0000000000..7b9ba45b7d --- /dev/null +++ b/doc/devblog/day_198__branching_out/comment_1_91ce3dc707ba1ba7c5d9e57e20ffce40._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="lex" + ip="2620:149:7:303:796f:ae98:a0a1:94b" + subject="comment 1" + date="2014-07-16T21:13:06Z" + content=""" +glad my bug inspired a blog post about it. =] +"""]]