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-07-17 11:41:43 -04:00
commit 814b804992
2 changed files with 34 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
doc/forum/How_to_get_git-annex_to_forget_a_commit__63__/comment_1_65471c42e163ac8ee6ec109f1397271b._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="CandyAngel"
ip="81.111.193.130"
subject="comment 1"
date="2014-07-17T15:43:03Z"
content="""
Joey has pointed me to the solution.
git-annex was remembering these files due to them being present in *.git/annex/index*.
A simple `rm .git/annex/index` after moving the git-annex branch to the earlier commit prevents the \"ghost\" log files from being recreated and Joey confirmed this is safe to do (git-annex automatically recreates it).
"""]]

22
doc/todo/wishlist:_--maxdepth_option_for_git_annex_find.mdwn Normal file
View file

@ -0,0 +1,22 @@
`git annex find` currently makes for a great way to find which files are already local, and don't need to get `git annex get` gotten; obviously `ls` just shows me all the files in a given directory, disregarding git-annex (and without recursing to subdirectories). I think that adding a '--maxdepth' option to `git annex find` would make it much easier to use at directories high up in the directory structure, since currently `git annex find` recurses all subdirectories necessarily, when I really just want to see whether or not there are git-annex files present from a given directory.
Obviously, since directories themselves are not git-annex objects, there is no way to say whether or not they are "present", but perhaps the most intuitive would be to say whether or not any git-annex files under a given directory are present.
For example, if I have:
./
+-- subdir0/
| +-- file0 (present in local git-annex repo)
| +-- file1 (present in local git-annex repo)
+-- subdir1/
| +-- file0 (not present in local git-annex repo)
| +-- file1 (not present in local git-annex repo)
+-- file2 (present in local git-annex repo)
and I type `git annex find --maxdepth 1 .`, the output might look something like:
subdir0/
file2
rather than:
subdir0/file0
subdir0/file1
file2