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

Merge remote-tracking branch 'in/master' into android-rebuild

Browse source
This commit is contained in:
Joey Hess 2013-09-23 01:16:21 +01:00
commit 6515ea8dde
6 changed files with 45 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
doc/bugs/OSX_app_issues/comment_13_cb12d419459e5cac766022ee0697fedc._comment Normal file
View file

@ -0,0 +1,18 @@
[[!comment format=mdwn
username="John"
ip="109.242.130.160"
subject="runshell typo prevents execution"
date="2013-09-22T00:24:10Z"
content="""
Using the latest Mountain Lion build available.
>$ /Applications/git-annex.app/Contents/MacOS/git-annex
>/Applications/git-annex.app/Contents/MacOS/runshell: line 25: syntax error near unexpected token `&'
Line 25:
>echo \"** runshell loop detected!\"> &2
Fix (obvious but for the sake of completeness):
>echo \"** runshell loop detected!\" >&2
"""]]

8
doc/bugs/OSX_app_issues/comment_14_c966fa549bc73c52034ac9abc49de52a._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.1.250"
subject="comment 14"
date="2013-09-22T14:15:28Z"
content="""
I have fixed the runshell typo and updated the builds.
"""]]

4
doc/forum/Syncing_with_an_encrypted_remote_from_a_different_computer__63__.mdwn Normal file
View file

@ -0,0 +1,4 @@
I created an "full archive" repo on my local pc and an encrypted "full backup" repo on Box.com. I 'm copying files on the local repo and they are getting encrypted and uploaded to Box. Superb so far :)
What I am wondering though is, suppose my local pc dies. How do I get the data out of Box unencrypted from a new pc?

13
doc/tips/using_gitolite_with_git-annex/comment_14_7d4d4515218d1259d32be3baeb5ee56e._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkSbvo_NbY-ev1VKtzwo7nEqUmvRO6rXGA"
nickname="François"
subject="comment 14"
date="2013-09-22T18:30:45Z"
content="""
@khaije
Could you paste your config file? Here is mine: http://paste.debian.net/44856/
I don't have any COMMANDS array. Could you elaborate your modifications please?
Thanks.
"""]]

2
standalone/linux/runshell
View file

@ -20,7 +20,7 @@ if [ ! -e "$base/bin/git" ]; then
exit 1
fi
if [ -n "$GIT_ANNEX_STANDLONE_ENV" ]; then
echo "** runshell loop detected!"> &2
echo "** runshell loop detected!" >&2
fi
# Get absolute path to base, to avoid breakage when things change directories.

2
standalone/osx/git-annex.app/Contents/MacOS/runshell
View file

@ -22,7 +22,7 @@ if [ ! -e "$bundle/git" ]; then
exit 1
fi
if [ -n "$GIT_ANNEX_STANDLONE_ENV" ]; then
echo "** runshell loop detected!"> &2
echo "** runshell loop detected!" >&2
fi
# Get absolute path to base, to avoid breakage when things change directories.