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 2012-11-27 17:06:37 -04:00
commit 5d6c643352
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
doc/bugs/JSON_output_broken_with___34__git_annex_sync__34__.mdwn Normal file
View file

@ -0,0 +1,18 @@
What steps will reproduce the problem?
$ git annex -j sync | json_reformat
What is the expected output? What do you see instead?
Expecting valid JSON, instead this happens:
$ git annex -j sync | json_reformat
lexical error: invalid char in json text.
{"command":"commit","file":""# On branch master nothing to c
(right here) ------^
$
What version of git-annex are you using? On what operating system?
Newest standalone (3.20121126), Linux i386. The "json_reformat" program is from the "yajl-tools" .deb package.

12
doc/forum/XMPP_email_setup_says_wrong_password_but_it__39__s_correct._Can_I_provide_some_kind_of_debug_data__63__/comment_5_c5b33c7a8aa8e6d0f9349510dac2366d._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.6.49"
subject="comment 5"
date="2012-11-27T20:32:47Z"
content="""
Hmm, I can't think of anything I've changed that would make it work where it didn't before.
I suspect the google apps problem is because it looks for a SRV record in DNS to find the jabber server, and something is wrong there. Without knowing what \"something@somedomain.com\" is standing for, it's hard to tell. :)
If you'd like to set me up something to test with, my email address is id@joeyh.name
"""]]