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 2013-11-09 13:51:48 -04:00
commit 70f6e154fb
13 changed files with 188 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/bugs/Mac_OS_10.9_GPG_erro_when_creating_USB_repo/comment_3_e5ec1e3ab304d738e3b0847287a47af4._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY"
nickname="Jimmy"
subject="Yes, I just figured that out"
date="2013-11-08T22:09:40Z"
content="""
I figured it out a couple of hours ago when I was able to use the existing USB repo on a new computer that doesn't have any of my private keys on it.
I didn't see an option in the web interface to use encryption - is it command line only?
"""]]

8
doc/bugs/Mac_OS_10.9_GPG_error_adding_S3_repo/comment_4_b524649cee751532d20a4894d71c5cf3._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY"
nickname="Jimmy"
subject="Maybe I'm missing something..."
date="2013-11-08T22:12:04Z"
content="""
But does cabal install git-annex install the assistant? On the Mac, I use the app bundle to launch the web interface from my applications folder.
"""]]

12
doc/bugs/Mac_OS_10.9_GPG_error_adding_S3_repo/comment_5_8312ba868ef616ec00563446c9c3464f._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY"
nickname="Jimmy"
subject="To answer my own question - "git annex webapp""
date="2013-11-09T00:10:28Z"
content="""
Will open the web app from the command line.
But now I get a different error trying to create an encrypted S3 repo.
(encryption setup) 09/Nov/2013:11:08:56 +1100 [Error#yesod-core] user error (gpg [\"--quiet\",\"--trust-model\",\"always\",\"--gen-random\",\"--armor\",\"1\",\"512\"] exited 127) @(yesod-core-1.2.4.5:Yesod.Core.Class.Yesod ./Yesod/Core/Class/Yesod.hs:485:5)
"""]]

10
doc/bugs/__34__Configuring_Jabber_Account__34___fails_with_a___34__Network_unreachable__34___error./comment_3_ed36f503f88611382b50687608b9b7e7._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="108.236.230.124"
subject="comment 3"
date="2013-11-08T18:42:22Z"
content="""
Seems like I should fix the standalone linux tarball to either include the host program, or better, build git-annex with the Haskell [DNS library](https://hackage.haskell.org/package/dns). (I think that the Mac app and other builds are built with DNS by default, since they have dependencies installed using cabal directly).
I need to first get that library included in Debian, so I can install it reliably on my build systems.
"""]]

8
doc/bugs/git-annex_broken_on_Android_4.3/comment_8_f58897eff6b4693f0c73474ccfe6e733._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawmhfodZquCI_EEl-f3h7HkROTszlsQL6yA"
nickname="Joe"
subject="Samsung Galaxy S4 also affected"
date="2013-11-09T02:47:54Z"
content="""
Verizon just pushed out 4.3 to Samsung Galaxy S4 devices. This issue is affecting me now too.
"""]]

40
doc/bugs/git_annex_describe_can_break_uuid.log.mdwn Normal file
View file

@ -0,0 +1,40 @@
### Please describe the problem.
`uuid.log` can end up in a state where `git annex describe` (and probably other things) stops working.
### What steps will reproduce the problem?
Run `git annex describe` against a remote that is not a an initialized git-annex repo.
### What version of git-annex are you using? On what operating system?
debian-packaged git-annex 4.20131106 on Linux Mint 13/Maya (Ubuntu Precise/12.04)
### Please provide any additional information below.
I will follow comments, but can also be found at [[https://microca.st/clacke]].
Full transcript to reproduce:
[[!format sh """
$ git init a
Initialized empty Git repository in /tmp/annex/a/.git/
$ git init b
Initialized empty Git repository in /tmp/annex/b/.git/
$ cd a/
$ git annex init
init ok
(Recording state in git...)
$ git remote add -f b ../b
Updating b
$ git annex describe b b # this should not be ok
describe b ok
(Recording state in git...)
$ git annex describe b b
describe b git-annex: Prelude.last: empty list
$ git cat-file blob git-annex:uuid.log
b timestamp=1383987654.900868s
...
# End of transcript.
"""]]

8
doc/bugs/git_annex_describe_can_break_uuid.log/comment_1_dc02075fb90490b643fd91b22ae5853b._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://id.clacke.se/"
nickname="clacke"
subject="dummy comment"
date="2013-11-09T09:33:35Z"
content="""
create comment feed
"""]]

20
doc/bugs/git_annex_doesn__39__t_work_in_Max_OS_X_10.9/comment_21_515039e321e0595f95430d8082bd54a5._comment Normal file
View file

@ -0,0 +1,20 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="108.236.230.124"
subject="comment 21"
date="2013-11-08T19:22:17Z"
content="""
Now that I can try running the 10.8 dmg on 10.9 myself, I get this failure:
<pre>
oberon:~ joeyh$ /Volumes/git-annex/git-annex.app/Contents/MacOS/git-annex
dyld: Symbol not found: _objc_debug_taggedpointer_mask
Referenced from: /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
Expected in: /Volumes/git-annex/git-annex.app/Contents/MacOS/bundle/I
in /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
</pre>
This makes me think that that adding back the OSX frameworks might possibly yield a dmg that can work on both versions. Although that's probably more likely to work if it's built on 10.8 and used on 10.9 than the other way around. Might be worth a try to revert commit 900351ab8585c171486cef853eff4a95ec151e6f and commit 9b663c7f8cf82cee523b75be1a8786fa7d34b428 to try that.
Oh well, I should have a native 10.9 dmg autobuild set up before too long. 10.8 autobuilder has built its last image unfortunately, due to being upgraded to 10.9.
"""]]

22
doc/forum/Help_on_my_usecase.mdwn Normal file
View file

@ -0,0 +1,22 @@
I am using git-annex assistant for a few months now and still don't think I have it all setup correctly. My setup is:
* Laptop Computer with low storage. Content creator, assistant: file source
* Desktop Computer with medium storage capacity. Consumer, assistant: manual Mode
* 2TB USB HD (EXT4) Backup, assistant: full backup
* 2.5" portable 500GB drive NTFS formatted. transfer to backup: assistant: tried transfer and partial backup
* Root Server on the web, not yet in the mix. Planned: Index only / content creator
My primary goal is getting the stuff from the Laptop to the 2TB USB drive, syncing the annex with the desktop so I can get files on the desktop from the backup.
What works:
* Checking stuff into the annex on the Laptop
* When the 2TB drive is connected to the Laptop, stuff is automatically moved there too
* Bare Repo on the 2.5" configured as partial backup automatically backups the data
What doesn't work:
* Connecting the 2.5" bare repo to the Desktop to move stuff to the backup drive automatically
* Having a human readable folder Structure on the 2.5" NTFS drive. I'd be ok to have a bare repo plus a special remote on the drive, but I don't know how to configure it
* How do I drop stuff from the bare repo on the 2.5" drive? I think a partial backup should drop content that is in a full backup, but it doesn't
Thanks for reading this long post. If anyone has any tips on how to configure the assistant, thats much appreciated.

22
doc/forum/Permission_denied___40__publickey__41___On_second_Step_...___63__/comment_2_b7a384e853e1756a684774348fad29e6._comment Normal file
View file

@ -0,0 +1,22 @@
[[!comment format=mdwn
username="Auroch"
ip="87.65.174.80"
subject="OK,thanx for this"
date="2013-11-09T09:10:42Z"
content="""
The problem is not solve, but with your informations, I think i've found somehting.
Is it possible that the problem is linked to my situation of port-forwarding ?
The remoteserver is a host (proxmox) with iptable port forwarding 62322 to the real port 22 of the VM hosting the git where I try to connect.
So could the problem seems to be that some actions are taken on the host and not the VM ... correct ?
[2013-11-09 09:51:33 CET] read: ssh-keygen [\"-F\",\"bla.remote.tld\"]
[2013-11-09 09:51:33 CET] read: ssh [\"-oNumberOfPasswordPrompts=0\",\"-n\",\"-p\",\"62322\",\"user@bla.remote.tld\",\"sh -c 'echo git-annex-probe loggedin;if which git-annex-shell; then echo git-annex-probe git-annex-shell; fi;if which rsync; then echo git-annex-probe rsync; fi;if which ~/.ssh/git-annex-shell; then echo git-annex-probe ~/.ssh/git-annex-shell; fi'\"]
[2013-11-09 09:51:35 CET] chat: ssh [\"user@bla.remote.tld\",\"sh -c 'mkdir -p '\\"'\\"'annex'\\"'\\"'&&cd '\\"'\\"'annex'\\"'\\"'&&if [ ! -d .git ]; then git init --bare --shared; fi&&git annex init'\"]
If it's correct, have you an idea for solving this ?
best regards
"""]]

8
doc/forum/Slightly_finer_control_over_file_whereabouts/comment_11_b7a8b9eaf114f883866fbf2be51b622f._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ"
nickname="Walter"
subject="comment 11"
date="2013-11-09T06:02:36Z"
content="""
No, this was using direct mode.
"""]]

10
doc/forum/assistant__44___direct_mode__44___large_files__44___command_line_-_how_do_these_play_together__63__.mdwn Normal file
View file

@ -0,0 +1,10 @@
Hi,
I am trying to understand git-annex, and the walkthroughs on the page did help a lot. I *feel* that git-annex is the solution for my use case: having a large archive, several computers, NAS both at work and at home, being offline during commuting, …
Everything seems to be clear for me when using the command line version. Using annex assistant looks promising, and it is easy to create repositories that match my usage. But now I see that these repositories are in direct mode by default; and I am not sure how this impacts my ability to work with large files. I do not want to end up with git (without annex) handling huge files.
So - can somebody explain how direct mode affects this? Can I switch to indirect mode with the assistant? Am I asking the wrong questions?
thanks,
Ulli

10
doc/forum/assistant__44___direct_mode__44___large_files__44___command_line_-_how_do_these_play_together__63__/comment_1_d90d1d599ce557af03c6f0f2ea188212._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.246"
subject="comment 1"
date="2013-11-09T17:36:01Z"
content="""
Files in direct mode are stored in the git annex the same way as when using indirect mode. But you're perhaps right to be wary of using direct mode, it's been quite easy to mess up while using it at the command line until very recently when the [[todo/direct_mode_guard]] was implemented.
You can switch repositories created using the assistant from direct to indirect mode if you like. The assistant works in either mode.
"""]]