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-04-08 15:04:59 -04:00
commit 4ba729461c
4 changed files with 67 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/bugs/Files_disappear_from_locally_paired_annexes_when_edited/comment_1_bdc97db9dc9954331e4c400baf9e5541._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 1"
date="2013-04-08T17:14:23Z"
content="""
When you say that the file \"disappeared from the repo\", do you mean that the actual file is no longer present on disk, or that the file is present on disk, but is no longer staged in the git repository?
Version 4.20130405 fixes a bug that can result in the latter behavior.
"""]]

11
doc/bugs/assistant_does_not_warn_on_files_it_failed_to_add/comment_3_10a38bdbf31dd4071e4bc4ac746d9c56._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 3"
date="2013-04-08T17:17:54Z"
content="""
The assistant does not yet support `.gitignore`
Does `git annex add` work on these files?
"""]]

36
doc/bugs/assistant_does_not_warn_on_files_it_failed_to_add/comment_4_b8fdf502c7e80aece5a9544a2078c85c._comment Normal file
View file

@ -0,0 +1,36 @@
[[!comment format=mdwn
username="Xyem"
ip="87.194.19.134"
subject="comment 4"
date="2013-04-08T18:25:48Z"
content="""
Interesting that you say .gitignore doesn't work with assistant because.. it definitely does.
$ git init /tmp/annex-test
$ cd /tmp/annex-test
$ git annex init
$ echo \"file.test\" > .gitignore
$ git annex assistant
$ echo \"test1\" > file.test
$ echo \"test2\" > file2.test
yields this log file:
(scanning...) [2013-04-08 19:17:03 BST] Watcher: Performing startup scan
(started...)
[2013-04-08 19:17:10 BST] Committer: Adding file2.test
add file2.test (checksum...) [2013-04-08 19:17:10 BST] Committer: Committing changes to git
(Recording state in git...)
(Recording state in git...)
[2013-04-08 19:17:11 BST] Committer: Committing changes to git
git annex find:
file2.test
On the previous files, the log shows all failed files being added to the annex find after the assistant was restarted (daemon.log.1) so I would imagine 'git annex add' would have worked fine too.
Right now, I'm just running
while true; do git annex add; sleep 1; done
in the annex directory, which gives me (expensive) watch-like behaviour, with fairly clear output for me to confirm everything has been added.
"""]]

10
doc/forum/__34__unable_to_resolve_reference_refs__47__heads__47__git-annex__34__/comment_3_3523884833b5fd458a35f898797bf897._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 3"
date="2013-04-08T17:23:24Z"
content="""
1. I don't understand how corruption could spread between git repositories. git is supposed to use checksums to prevent bad data propigating. I would be running a lot of `git fsck` if I were you. Yes, `git annex fsck` will update location log information for files it finds in the local repository.
2. Again this looks like something is corrupting your repository when git writes it. Perhaps bad memory? I think you need to get to the root of the problem with the corrupting git repositories.
"""]]