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-10-28 13:08:17 -04:00
commit f0bfa065eb
6 changed files with 99 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
doc/forum/Deduplication_in_direct_mode.mdwn Normal file
View file

@ -0,0 +1,18 @@
Hi,
I'm using git-annex across a number of (indirect) repositories, making heavy use of deduplication for organizing files according to various different aspects.
Now I want to keep part of the files also on a VFAT device, which doesn't let me use indirect mode. In direct mode, however, git-annex "get" or "copy" places a separate copy of each file in the repository, whereas in indirect mode, it would just keep a single copy and maintain a number of (inexpensive) symbolic links. Since space on the VFAT drive is limited, I would like to just keep one, specific copy, not caring about the others. If I "drop" an unneeded copy of the file, it also gets replaced by the ASCII "link" in all other places that contained the same file. Therefore, I can either have multiple copies of the same data or none at all.
Imagine you have a bunch of photos sorted into a directories in meant to make it easy to find them (same file name means same file content):
./photo1.jpg
./photo2.jpg
./by-date/2014-10-27/photo1.jpg
./by-date/2014-10-28/photo2.jpg
./by-event/holiday-by-the-sea/photo1.jpg
./by-event/her-birthday/photo2.jpg
I want to keep a copy of ./photo?.jpg in the VFAT repository, but not the other (identical) files. How do I do that? Or is there really no way of doing this?
Thanks.

73
doc/forum/Using_git-annex.mdwn Normal file
View file

@ -0,0 +1,73 @@
Hi,
I have created a git annex repo, added data. I then went to check it out in another location in the following way (my goal is to checkout origin, add a test file, push it back to origin).
git clone ../test_repo/
282 17:19 cd test_repo/
283 17:19 ls
284 17:19 git status
285 17:22 git annex init DEV
286 17:22 touch test.txt
287 17:22 vi test.txt
288 17:22 git annex merge
289 17:22 git annex add test.txt
290 17:22 git commit -am "test"
291 17:23 git push origin master git-annex
However I am getting the following error
Counting objects: 3, done.
Delta compression using up to 48 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 364 bytes | 0 bytes/s, done.
Total 3 (delta 1), reused 0 (delta 0)
remote: error: refusing to update checked out branch: refs/heads/master
remote: error: By default, updating the current branch in a non-bare repository
remote: error: is denied, because it will make the index and work tree inconsistent
remote: error: with what you pushed, and will require 'git reset --hard' to match
remote: error: the work tree to HEAD.
remote: error:
remote: error: You can set 'receive.denyCurrentBranch' configuration variable to
remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into
remote: error: its current branch; however, this is not recommended unless you
remote: error: arranged to update its work tree to match what you pushed in some
remote: error: other way.
remote: error:
remote: error: To squelch this message and still keep the default behaviour, set
remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'.
To /test_repo/
! [remote rejected] master -> master (branch is currently checked out)
error: failed to push some refs to '/test_repo/'
What am I missing?

2
doc/install.mdwn
View file

@ -10,7 +10,7 @@ detailed instructions | quick install
  [[Ubuntu]] | `apt-get install git-annex`
  [[Fedora]] | `yum install git-annex`
  [[FreeBSD]] | `pkg_add -r hs-git-annex`
  [[ArchLinux]] | `yaourt -Sy git-annex`
  [[ArchLinux]] | `yaourt -Sy git-annex-bin`
  [[NixOS]] | `nix-env -i git-annex`
  [[Gentoo]] | `emerge git-annex`
  [[ScientificLinux5]] |

10
doc/install/ArchLinux.mdwn
View file

@ -1,10 +1,10 @@
There are three non non-official packages for git-annex in the Archlinux User Repository. Any of these may be installed manually per [AUR guidelines](https://wiki.archlinux.org/index.php/AUR_User_Guidelines#Installing_packages) or using a wrapper such as [`yaourt`](https://wiki.archlinux.org/index.php/yaourt) shown below.
There are four non non-official packages for git-annex in the Arch Linux User Repository. Any of these may be installed manually per [AUR guidelines](https://wiki.archlinux.org/index.php/AUR_User_Guidelines#Installing_packages) or using a wrapper such as [`yaourt`](https://wiki.archlinux.org/index.php/yaourt) shown below.
1. The simplest method is to use the [git-annex-bin](https://aur.archlinux.org/packages/git-annex-bin/) package based on the [prebuilt Linux tarballs](http://downloads.kitenet.net/git-annex/linux/current/). This package includes many of the binary shims from the pre-built package. Although common Linux system utilities have been stripped in favor of normal dependencies, the pre-configured Haskell libraries included out of the box make this an easy install. The disadvantage is the resulting installation is a bit on the heavy side at nearly 100M.
$ yaourt -Sy git-annex-bin
2. A more traditional source package is available at [git-annex](https://aur.archlinux.org/packages/git-annex/). This depends on a large number of Haskell packages available from a third party repository or through Cabal. This has been historically a bit problematic and the package frequently sits flagged out of date. The state of dependencies also varies, so some intervention may be required to get this option to work.
2. A more traditional source package is available at [git-annex](https://aur.archlinux.org/packages/git-annex/). This depends on a large number of Haskell packages available from a third party repository or through Cabal. You must either enable a 3rd party repo that has the dependencies or have a working Cabal installation. Unless you know what you are doing this is a bit problematic and some intervention may be required to get this option to work. The state of available dependency versions also varies so this may not work at all times.
$ yaourt -Sy git-annex
@ -12,7 +12,11 @@ There are three non non-official packages for git-annex in the Archlinux User Re
$ yaourt -Sy git-annex-git
Finally you may choose to forgo the Archlinux package system and install git-annex directly through cabal.
4. A Cabal sandbox build is also available
$ yaourt -Sy git-annex-cabal
Finally you may choose to forgo the Arch Linux package system entirely and install git-annex directly through cabal.
$ pacman -S git rsync curl wget gnupg openssh cabal-install
$ cabal update

8
doc/install/ArchLinux/comment_1_da5919c986d2ae187bc2f73de9633978._comment
View file

@ -1,8 +0,0 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlwYMdU0H7P7MMlD0v_BcczO-ZkYHY4zuY"
nickname="Morris"
subject="Arch Linux"
date="2012-10-17T13:21:24Z"
content="""
For Arch Linux there should be the AUR package [git-annex-bin](https://aur.archlinux.org/packages.php?ID=63503) mentioned, because it's easier to install (no haskell dependencies to be installed) and is based on the prebuild linux binary tarball.
"""]]

10
doc/install/ArchLinux/comment_5_cbc960cd78bf5b90e3bb6cb605d6d970._comment
View file

@ -1,10 +0,0 @@
[[!comment format=mdwn
username="http://alerque.com/"
nickname="Caleb"
subject="Out of date"
date="2013-12-28T22:04:24Z"
content="""
The AUR package you reference is woefully out of date. I have updated the standalone variant so it might be worth using that until the maintainer catches up.
yaourt -Sy git-annex-standalone
"""]]