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-09-12 14:06:19 -04:00
commit 5aecf2b42d
8 changed files with 88 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/cabal_install_fails_to_install_manpage.mdwn
View file

@ -15,3 +15,5 @@ git annex from a recent git build (4.20130909-g7f079d6) in Debian wheezy.
### Please provide any additional information below.
<del>This could be just a documentation problem...</del> Actually, the manpage can be read directly from the source tree in `doc/git-annex.mdwn`, but I still think it should be installed, for [[!wikipedia POLA]]'s sake. --[[anarcat]]
I figured it out - that stuff is in the makefile, I updated [[install/cabal]] accordingly, so [[done]]. --[[anarcat]]

10
doc/devblog/day_6__gcrypt_fully_working/comment_2_1f8faa65bbd56a12588b43a5bc822d96._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.4.51"
subject="comment 2"
date="2013-09-12T16:53:02Z"
content="""
Well, rsync and gcrypt use the same locations for annexed content, so it's theoretically possible.
However, it seems a lot easier to just add a gcrypt remote and let git-annex use the existing rsync remote for the content that is already stored in it.
"""]]

21
doc/forum/Links_or_actual_files__63___Confused__33__.mdwn Normal file
View file

@ -0,0 +1,21 @@
I don't think it's a bug or a todo, just a request for clarification.
So, I installed git-annex first on a Mac, and created the initial repository, and started dropping stuff into it. All fine.
Created a second repository on an external (but never disconnected, also does Time Machine) drive. All fine. Everything's there.
Went across the room to my Linux desktop, installed git-annex, and tried to pair it to my Mac's git-annex repo. Hit <a href="http://git-annex.branchable.com/bugs/bad_comment_in_ssh_public_key_ssh-rsa/#comment-0ee00f307909723fdf8c73695787f067">this bug</a>, installed latest git-annex from tarball and got past that and got the pairing done. Syncing happened, all looked well...
But when I look in the annex dir on that Linux machine, I now just see symlinks to the actual files in the repo's .git/annex stuff. It kinda works, but it's a bit distracting, especially if you open such a file in any desktop app and you can see it's got the target of the link (some sha-value filename.ext) rather than the sensibly-named link. Including files created and coped into that annex on that machine. (In Nautilus they all show with symlink & lock emblems.)
Look again at some documentation, and apparently it's <a href="http://git-annex.branchable.com/how_it_works/">supposed to do this</a>
Which makes me wonder why it *isn't* doing it on the Mac I started the repository on?
Went to another mac (laptop) and installed git-annex, and set up pairing to the first mac - as far as I can tell, doing the exact same procedure as I did under Linux. TBH through the webapp there's not much scope for doing it a different way. Files sync across...
And there they are, the actual files, directly in the annex dir, not symlinks.
(I am by the way confirming this at the commandline, it's not just what Finder/Nautilus may be displaying to me graphically.)
Now, seeing the actual files in the annex directory is what I *prefer*; but I'm a: confused as to why the Macs are doing it that way but Linux isn't, and b: given the "how it works" link, why everything isn't using the links.

8
doc/forum/Links_or_actual_files__63___Confused__33__/comment_1_779cee2448d7070b1dd636d01296c01e._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.4.51"
subject="comment 1"
date="2013-09-12T17:58:24Z"
content="""
When you create a git-annex repository using the webapp, it uses [[direct_mode]]. That is not the default if you create a repository by hand at the command line, although you can enable it if you prefer it.
"""]]

10
doc/forum/git-annex_on_archlinuxarm__44___armv6/comment_1_88fa644df8614c2db0d092b3eb1d3156._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.4.51"
subject="comment 1"
date="2013-09-12T16:56:50Z"
content="""
You seem to be trying to take a binary built for one distribution with one CPU architecture and use it on another distribution on another CPU architecture. It's not very susprising that this does not work.
Compiling git-annex from source for your particular architecture and distribution should not be difficult.
"""]]

10
doc/forum/manual_update_of_.git__47__annex__47__objects/comment_1_ea6ec91150c8962e2711631f2422bf3a._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.154.4.51"
subject="comment 1"
date="2013-09-12T17:11:41Z"
content="""
I do not recommend manually messing with the contents of .git/annex/objects. It is a good way to lose data.
If you look at the documentation for fsck in git-annex's man page, you will find the answer to your question.
"""]]

6
doc/install/cabal.mdwn
View file

@ -40,3 +40,9 @@ you want, and use cabal as follows inside its source tree:
cabal configure
cabal build
cabal install --bindir=$HOME/bin
To install documentation and manpages, you will actually want to use the makefile:
make install PREFIX=$HOME
(!) Note that this will install git-annex in `/usr` and not `$HOME`, a bug report has been opened about this: [[todo/makefile: respect $PREFIX]]. --[[anarcat]]

21
doc/todo/makefile:_respect___36__PREFIX.mdwn Normal file
View file

@ -0,0 +1,21 @@
The `Makefile` should respect a `PREFIX` passed on the commandline so git-annex can be installed in (say) `$HOME`.
Simple patch:
[[!format diff """
diff --git a/Makefile b/Makefile
index b8995b2..5b1a6d4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ all=git-annex $(mans) docs
GHC?=ghc
GHCMAKE=$(GHC) $(GHCFLAGS) --make
-PREFIX=/usr
+PREFIX?=/usr
CABAL?=cabal # set to "./Setup" if you lack a cabal program
# Am I typing :make in vim? Do a fast build.
"""]]
--[[anarcat]]