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

Merge remote-tracking branch 'branchable/master'

Browse source
This commit is contained in:
Joey Hess 2011-04-04 21:32:56 -04:00
commit 98effd040b
4 changed files with 57 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
doc/bugs/fat_support/comment_2_bb4a97ebadb5c53809fc78431eabd7c8._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 2"
date="2011-04-04T18:20:45Z"
content="""
Hey @fmarier. Well, this bug report is closed because you can already get rid of the symlinks. Just put a bare git repo on your fat filesystem, and use git-annex copy --to/--from there.
Now, that puts all the files that are on the device in .git/annex/objects/xx/yy/blah.mp3 -- how well rockbox would support that I don't know. And if it tries to modify or delete those files, git annex also can't help you manage those changes.
Another recent option is the [[special_remotes/directory]] special remote type, which again uses \"xx/yy/blah.mp3\" and can't track changes made to the files. This could perhaps be extended in the direction you suggest, although trying to fit this into the special remote infrastructure might not be a good fit really.
The most likely way this has to get dealt with is really by using [[todo/smudge]] filters, which would eliminate the symlinks and allow copying a non-bare git repo onto vfat.
"""]]

21
doc/forum/bainstormning:_git_annex_push___38___pull.mdwn Normal file
View file

@ -0,0 +1,21 @@
Wouldn't it make sense to offer
git annex pull
which would basically do
git pull
git annex get
and
git annex push
which would do
git annex commit .
git annex put # (the proposed "send to default annex" command)
git commit -a -m "$HOST $(date +%F-%H-%M-%S)" # or similar
git push
Resulting in commands that are totally analogous to git push & pull: Sync all data from/to a remote.

10
doc/forum/wishlist:_git_annex_put_--_same_as_get__44___but_for_defaults/comment_1_d5413c8acce308505e4e2bec82fb1261._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 1"
date="2011-04-04T18:13:46Z"
content="""
This begs the question: What is the default remote? It's probably *not* the same repository that git's master branch is tracking (ie, origin/master). It seems there would have to be an annex.defaultremote setting.
BTW, mr can easily be configured on a per-repo basis so that \"mr push\" copies to somewhere: `push = git push; git annex push wherever`
"""]]

12
doc/forum/wishlist:_git_annex_put_--_same_as_get__44___but_for_defaults/comment_2_0aa227c85d34dfff4e94febca44abea8._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U"
nickname="Richard"
subject="comment 2"
date="2011-04-04T20:45:30Z"
content="""
In my case, the remotes are the same, but adding a new option could make sense.
And while I can tell mr what to do explicitly, I would prefer if it did the right thing all by itself. Having to change configs in two separate places is less than ideal.
I am not sure what you mean by `git annex push` as that does not exist. Did you mean copy?
"""]]