mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2014-07-16 17:21:25 -04:00
commit 059e914f3f
6 changed files with 77 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/Assistant_merge_loop/comment_10_8fe176691f0f61c15085d3c38f0ea50f._comment Normal file
View file

@ -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
"""]]

10
doc/bugs/Assistant_merge_loop/comment_11_6e3a78327c0b813415ebf85e298813d4._comment Normal file
View file

@ -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?
"""]]

10
doc/bugs/OSX_assistant_fails_to_download_new_file_after_initial_pass/comment_6_edd7d5d5c761ff665840f0ef7bea50c9._comment Normal file
View file

@ -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?
"""]]

8
doc/devblog/day_198__branching_out/comment_1_91ce3dc707ba1ba7c5d9e57e20ffce40._comment Normal file
View file

@ -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. =]
"""]]

31
doc/forum/Restricting_SSH_+_supply_key/comment_9_2faceeaf0d39f82e5d624eae19e4ca53._comment Normal file
View file

@ -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.
"""]]

10
doc/forum/Where_is_the_content__63__/comment_4_a36b35d47472b5db779b0489bf3d4893._comment Normal file
View file

@ -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\"
"""]]