This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc 2015-04-07 07:03:14 +00:00 committed by admin
parent cceecbafa6
commit 8716fb2b8a

View file

@ -2,20 +2,18 @@ How do we get into the following situation?
First we complain about an ignored file (why not just ignore it?), First we complain about an ignored file (why not just ignore it?),
and then apparently we delete the ignored file. and then apparently we delete the ignored file.
``` [...]
[...] import Pictures/2005/11/16/.IMG_0819.tmpwrite.JPG (duplicate) ok
import Pictures/2005/11/16/.IMG_0819.tmpwrite.JPG (duplicate) ok (Recording state in git...)
(Recording state in git...) The following paths are ignored by one of your .gitignore files:
The following paths are ignored by one of your .gitignore files: Pictures/2008/11/27/.img_1315.tmpwrite.jpg
Pictures/2008/11/27/.img_1315.tmpwrite.jpg Use -f if you really want to add them.
Use -f if you really want to add them. fatal: no files added
fatal: no files added git-annex: user error (xargs ["-0","git","--git-dir=/.../annex/.git","--work-tree=/.../annex","add","--"] exited 123)
git-annex: user error (xargs ["-0","git","--git-dir=/.../annex/.git","--work-tree=/.../annex","add","--"] exited 123)
# eek, the file that we complained about has vanished! # eek, the file that we complained about has vanished!
$ rm ../Pictures/2008/12/27/.img_1315.tmpwrite.jpg $ rm ../Pictures/2008/12/27/.img_1315.tmpwrite.jpg
rm: cannot remove ../Pictures/2008/11/27/.img_1315.tmpwrite.jpg: No such file or directory rm: cannot remove ../Pictures/2008/11/27/.img_1315.tmpwrite.jpg: No such file or directory
```
Expected: Expected:
- leave ignored files untouched. Maybe report "Skipped ignored files." - leave ignored files untouched. Maybe report "Skipped ignored files."