summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-24 23:44:48 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-24 23:44:48 -0400
commitdbf22b5aa8d45c1fe598b78e885fd54fca9e671a (patch)
tree302dce32ba4b67c028f908e8ee58630b81c93aca
parentd89ef06a2718db9db8af85ff1166ffdeb45a9ba8 (diff)
parentc81b2d1199da68c586d059e1ecd30314fa9dce21 (diff)
Merge branch 'master' of ssh://git-annex.branchable.com
-rw-r--r--doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location/comment_1_b524e70156e8bc1219d5c6741974ad99._comment18
1 files changed, 18 insertions, 0 deletions
diff --git a/doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location/comment_1_b524e70156e8bc1219d5c6741974ad99._comment b/doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location/comment_1_b524e70156e8bc1219d5c6741974ad99._comment
new file mode 100644
index 000000000..6b741e85e
--- /dev/null
+++ b/doc/bugs/Error_when_moving_annexed_file_to_a_.gitignored_location/comment_1_b524e70156e8bc1219d5c6741974ad99._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlq4ClC5EMN1Vq1DpWXAqP5TiDnCK1mSfk"
+ nickname="Jonas"
+ subject="Happens with import, too"
+ date="2013-11-24T23:24:09Z"
+ content="""
+This happens to me when using git annex import, too (on version 4.20131106)
+
+ (Recording state in git...)
+ The following paths are ignored by one of your .gitignore files:
+ path/to/some/directory/.svn
+ Use -f if you really want to add them.
+ fatal: no files added
+
+ git-annex: user error (xargs [\"-0\",\"git\",\"--git-dir=/path/to/annex/.git\",\"--work-tree=/path/to/annex\",\"add\",\"--\"] exited 123)
+failed
+
+"""]]