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-05-18 11:19:19 -04:00
commit b26c0ba61e
8 changed files with 93 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
doc/bugs/Android_version_apparently_unable_to_run_sha256sum.mdwn Normal file
View file

@ -0,0 +1,25 @@
I’m running git-annex 5.20140517-gee56d21 on Android 4.3.
Running “git annex add filename” from the command line fails to execute sha256sum:
[[!format sh """
git-annex: sha256sum: createProcess: runInteractiveProcess: exec: does not exist (No such file or directory)
failed
git-annex: add: 1 failed
"""]]
“type sha256sum” says “sha256sum not found”, and indeed, /data/data/ga.androidterm/bin only contains the following files: busybox, git, git-annex, git-receive-pack, git-shell, git-upload-archive, git-upload-pack, gpg, rsync, ssh, ssh-keygen, trustedkeys.gpg.
Running “busybox sha256sum” does the right thing.
The assistant says “Added filename” every time it’s started but the file does not actually get added.
The only relevant log lines seem to be:
[[!format sh """
[2014-05-18 16:57:06 EEST] Watcher: add direct git-annex.apk
[2014-05-18 16:57:07 EEST] read: lsof ["-F0can","--","git-annex.apk"]
[2014-05-18 16:57:08 EEST] Committer: Adding git-annex.apk
add git-annex.apk [2014-05-18 16:57:08 EEST] chat: git [--git-dir=/storage/emulated/legacy/annex/.git","--work-tree=/storage/emulated/legacy/annex","-c","core.bare=false","check-attr","-z","--stdin","annex.backend","annex.numcopies","--"]
[2014-05-18 16:57:08 EEST] read: sha256sum ["git-annex.apk"]
"""]]

27
doc/bugs/webapp_doesn__39__t_start_when___126____47__annex_isn__39__t_a_git_repo.mdwn Normal file
View file

@ -0,0 +1,27 @@
### Please describe the problem.
The webapp doesn't start. There is no feedback as to what is wrong when starting the OS X app. Makes for a very confusing behaviour.
When starting git-annex-webapp directly, it says:
git-annex: no git repository in /Users/lhunath/annex
### What steps will reproduce the problem?
Create a ~/annex that is not a git repo.
### What version of git-annex are you using? On what operating system?
git-annex version: 5.20140517-g0aed6d9
build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV FsEvents XMPP DNS Feeds Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier ddar hook external
local repository version: unknown
supported repository version: 5
upgrade supported from repository versions: 0 1 2 4
### 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
$ /Applications/git-annex.app/Contents/MacOS/git-annex-webapp
git-annex: no git repository in /Users/lhunath/annex
# End of transcript or log.
"""]]

8
doc/forum/Git_Annex_Assistant_won__39__t_backup_files_to_removable_drive/comment_2_6649077583bc14730a08aaaca7ccb62e._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnov5q9_Cl4Ps5NoYE08yE01NLSvBANnY8"
nickname="Eric"
subject="comment 2"
date="2014-05-18T09:35:45Z"
content="""
Okay, I understand now. Probably Assistant should only treat the external drive that way if it's in the \"transfer\" group.
"""]]

14
doc/forum/Storing_git_repos_in_git-annex/comment_5_f9520cbc6669622aa342acad35581943._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8"
nickname="Hamza"
subject="comment 5"
date="2014-05-18T12:55:47Z"
content="""
My, 2 cents. I used to do the same keep my git repos in Dropbox. I do not push/pull to dropbox I just keep them in there so they sync between my machines. My use case is that I am in the middle of a change and I need to switch computers (home/office) I can continue where I left of on another machine otherwise you have to make wierd commits with broken code. So IMHO it is perfectly reasonable for a single person to keep his git repo in git-annex assuming I don't use it as a central repo where other people pull push.
Plus one giant problem with git annex is that there is no way to revert a file in direct repo. It only sync and reverting to old files take a lot of effort (convert to indirect checkout commit save file to a temp location convert back to direct mode place the file back its place.) with a git repo in annex I can just use git to revert files.
On the other hand, git likes to create a lot of small files and sync them can take a lot of time. annex copies on file at a time.
That said, at one point I did experiment putting a git repo in annex for testing (using --git-dir option) it did work so it should not be that big of a deal to add the support.
"""]]

9
doc/forum/webapp_and_manual_mode/comment_3_f0739bf4304a91a5d4ec33ac2421c966._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkAUMhKOSkh9JaBA6xst3XxQIIsDEq5Zd4"
nickname="Ovidiu"
subject="Also confused by the manual mode"
date="2014-05-18T06:39:54Z"
content="""
@Joeyh: would you mind explaining the modes maybe on their own wiki page?
I've got most of them but the sense and functioning of the manual method escapes me :-/
"""]]

2
doc/special_remotes/webdav.mdwn
View file

@ -39,4 +39,4 @@ the webdav remote.
Setup example:
# WEBDAV_USERNAME=joey@kitenet.net WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://www.box.com/dav/git-annex chunksize=75mb keyid=joey@kitenet.net
# WEBDAV_USERNAME=joey@kitenet.net WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://dav.box.com/dav/git-annex chunksize=75mb keyid=joey@kitenet.net

8
doc/todo/required_content/comment_3_b16a8e8b45ceee887c8c0167b7859654._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
nickname="Richard"
subject="comment 3"
date="2014-05-18T06:49:35Z"
content="""
22:34:10 < joeyh> required content is implemented, though active verification is not
"""]]

2
doc/walkthrough/setup_git.mdwn
View file

@ -1,2 +1,2 @@
If you haven't configured your identity for GIT, you will have to do this before git annex will work.
If you haven't configured your identity for Git, you will have to do this before git annex will work.