diff options
author | Joey Hess <joey@kitenet.net> | 2013-02-07 08:09:40 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-02-07 08:09:40 -0400 |
commit | a7b151f28926f3a6455f4456c496aeaf31df091a (patch) | |
tree | c6d440f1fead6838c6e07f8c2c8a10bff46ade27 | |
parent | bf1a88dba7e6663c1decf62f1edc83a753b4c1f2 (diff) | |
parent | 890cd0136f27e71c8dc0e3573e8399015f57937d (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
3 files changed, 97 insertions, 0 deletions
diff --git a/doc/bugs/dropunused_doesn__39__t_work_in_my_case__63__.mdwn b/doc/bugs/dropunused_doesn__39__t_work_in_my_case__63__.mdwn new file mode 100644 index 000000000..09bfd0c3b --- /dev/null +++ b/doc/bugs/dropunused_doesn__39__t_work_in_my_case__63__.mdwn @@ -0,0 +1,58 @@ +What steps will reproduce the problem? + +I am unable to create a minimal setup to reproduce this unfortunately. But my case is the following: + +* Two synced repos, I have switched between direct and indirect in both, currently they are indirect +* I have two submodules in the repos (not related to the unuesd files) + +* I used "git rm -r" to remove a bunch of files along with "git mv" to move some +* I have three commits of actions like this + +* In one repo, the one where I did the deletions, I have 172 unused files, and all seem to come from the first of the three commits +* In the second repo, to which I synced, I have 188 unused files, which includes a couple of files from the third commit as well + +* If I try to dropunused either a single file or the whole range of the files, from either repo, I get git-annex telling me "ok, recording state" but when I run unused again the files are still there. And looking into .git/objects/annex/ the file is still present + +This is the debug from the drop command: + + dropunused 9 [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","show-ref","git-annex"] + [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","show-ref","--hash","refs/heads/git-annex"] + [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..5f3fc9db5c7badb5fb25c3159c20584f11dadaf9","--oneline","-n1"] + [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..8e5674078706864f2eade86d8aa43027e05afc1d","--oneline","-n1"] + [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..cbe492cfa79728698f5d891d7f716fbcd9fc29e2","--oneline","-n1"] + [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..48a1bdf98a10ad9a81c0587f8909e94c1c0dccc4","--oneline","-n1"] + [2013-02-07 12:47:24 CET] chat: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","cat-file","--batch"] + [2013-02-07 12:47:24 CET] read: git ["config","--null","--list"] + [2013-02-07 12:47:24 CET] chat: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","hash-object","-w","--stdin-paths"] + [2013-02-07 12:47:24 CET] feed: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","update-index","-z","--index-info"] + [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","show-ref","--hash","refs/heads/git-annex"] + [2013-02-07 12:47:24 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","write-tree"] + [2013-02-07 12:47:24 CET] chat: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","commit-tree","76f5041bc6e8a109e0309a09b5f36cd0da8b204a","-p","refs/heads/git-annex"] + [2013-02-07 12:47:24 CET] call: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","update-ref","refs/heads/git-annex","96de755475bdd8f0f948dd6421c3956803a63e66"] + ok + (Recording state in git...) + +If I run it again, I get: + + dropunused 9 [2013-02-07 12:47:47 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","show-ref","git-annex"] + [2013-02-07 12:47:47 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","show-ref","--hash","refs/heads/git-annex"] + [2013-02-07 12:47:47 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..96de755475bdd8f0f948dd6421c3956803a63e66","--oneline","-n1"] + [2013-02-07 12:47:48 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..8e5674078706864f2eade86d8aa43027e05afc1d","--oneline","-n1"] + [2013-02-07 12:47:48 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..cbe492cfa79728698f5d891d7f716fbcd9fc29e2","--oneline","-n1"] + [2013-02-07 12:47:48 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","log","refs/heads/git-annex..48a1bdf98a10ad9a81c0587f8909e94c1c0dccc4","--oneline","-n1"] + [2013-02-07 12:47:48 CET] chat: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","cat-file","--batch"] + [2013-02-07 12:47:48 CET] read: git ["config","--null","--list"] + [2013-02-07 12:47:48 CET] chat: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","hash-object","-w","--stdin-paths"] + [2013-02-07 12:47:48 CET] feed: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","update-index","-z","--index-info"] + [2013-02-07 12:47:48 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","show-ref","--hash","refs/heads/git-annex"] + [2013-02-07 12:47:48 CET] read: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","write-tree"] + [2013-02-07 12:47:48 CET] chat: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","commit-tree","e40d82db10c60519f6a3a72055e9577850972fdf","-p","refs/heads/git-annex"] + [2013-02-07 12:47:48 CET] call: git ["--git-dir=/home/arand/.git","--work-tree=/home/arand","update-ref","refs/heads/git-annex","6cf49f629251f9b39fa8b457cf6590c71c1d509b"] + ok + (Recording state in git...) + + +What version of git-annex are you using? On what operating system? + +git-annex: 3.20130124 +Debian: sid 2013-02-01 diff --git a/doc/forum/Let_watch_selectively_annex_files.mdwn b/doc/forum/Let_watch_selectively_annex_files.mdwn new file mode 100644 index 000000000..f56b19452 --- /dev/null +++ b/doc/forum/Let_watch_selectively_annex_files.mdwn @@ -0,0 +1,27 @@ +Hello, + +First of all, thanks to Joey for developing git-annex, good job! + +I have a small feature request: when running git annex watch, new files are automatically added to the annex. It would be nice to let this depend on an attribute: add a file to annex if an attribute is set, otherwise do a regular git add. + +My use-case is the following: I have a repository containing documents I'm working on (mostly LaTeX), which I'd like to be regular files in git (no annex), and a bunch of extra documentation (pdfs) and images, which I'd like to go to the annex. I currently set a git-attribute (addtoannex), and use a shell script to selectively add files to annex as follows: + +Content of .gitattributes: + + *.png addtoannex + *.jpg addtoannex + +Snippet of add script: + + git check-attr addtoannex "$FILE" | grep -q ": set$" + if [ $? -eq 0 ]; then + git annex add "$FILE" + else + git add "$FILE" + fi + +It would be great if the watcher could honour an attribute. + +best regards, + +Tom diff --git a/doc/forum/Watch__47__assistant__47__webapp_documentation.mdwn b/doc/forum/Watch__47__assistant__47__webapp_documentation.mdwn new file mode 100644 index 000000000..3d185ba80 --- /dev/null +++ b/doc/forum/Watch__47__assistant__47__webapp_documentation.mdwn @@ -0,0 +1,12 @@ +Hello, + +I'm not sure about the differences and interactions between watch / assistant / webapp / direct mode. I think I figured the following out, can someone confirm this, and perhaps a few words to the documentation / man page? + +- git annex watch uses inotify to find new files, and runs git annex add on them (it does not do regular git add) +- git annex assistant does the same as watch, but also runs git annex sync for each new file (does it also enable direct mode?) +- git annex webapp does the same as assistant, and also starts a webapp (in my case it immediately started sending files to origin, without asking for confirmation, which was surprising, I guess this is because I have * annex.numcopies=2 set, and there was only one copy. Still I interpreted the documentation as if it would only show me an interface, not start doing things right away.) + +Do these commands do anything else than what I described above? + +best regards, +Tom |