Merge branch 'master' of ssh://git-annex.branchable.com

2 files changed, 56 insertions, 0 deletions

diff --git a/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_3_d296ef26fc90f4e3166bba6d2de0a1ee._comment b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_3_d296ef26fc90f4e3166bba6d2de0a1ee._comment
new file mode 100644
index 000000000..4adee73bd
--- /dev/null
+++ b/doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_3_d296ef26fc90f4e3166bba6d2de0a1ee._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg"
+ nickname="Tim"
+ subject="comment 3"
+ date="2013-10-17T16:04:03Z"
+ content="""
+I had a recent backup of the data so no real harm was done.
+"""]]
diff --git a/doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47__..__47__C:__92__Users__92____91__...__93____92__annex__92__.git__47__config__39__:_Invalid_argument___40__Windows__41__/comment_2_b47d6d188f38a8e4ca5ef5f70afadf6a._comment b/doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47__..__47__C:__92__Users__92____91__...__93____92__annex__92__.git__47__config__39__:_Invalid_argument___40__Windows__41__/comment_2_b47d6d188f38a8e4ca5ef5f70afadf6a._comment
new file mode 100644
index 000000000..a40e9cbe5
--- /dev/null
+++ b/doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47__..__47__C:__92__Users__92____91__...__93____92__annex__92__.git__47__config__39__:_Invalid_argument___40__Windows__41__/comment_2_b47d6d188f38a8e4ca5ef5f70afadf6a._comment
@@ -0,0 +1,48 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM"
+ nickname="Bruno"
+ subject="comment 2"
+ date="2013-10-16T22:47:46Z"
+ content="""
+There's no other repo yet. I have the same problem when I try to sync between two repos but I simplified the instructions to reproduce the bug easily.
+
+Here's the instructions on Debian :
+[[!format sh \"\"\"
+bruno@debian:~$ mkdir annex
+bruno@debian:~$ cd annex
+bruno@debian:~/annex$ git init
+Initialized empty Dépôt git dans /home/bruno/annex/.git/
+bruno@debian:~/annex$ git annex init
+init  ok
+(Recording state in git...)
+bruno@debian:~/annex$ echo test > test
+bruno@debian:~/annex$ git annex add .
+add test (checksum...) ok
+(Recording state in git...)
+bruno@debian:~/annex$ git commit -a -m added
+[master (root-commit) 631049d] added
+ 1 file changed, 1 insertion(+)
+ create mode 120000 test
+bruno@debian:~/annex$ git annex sync
+commit
+ok
+bruno@debian:~/annex$\"\"\"]]
+
+It seems --git-dir wants 'c:/...' instead of 'c:\\...'.
+
+[[!format sh \"\"\"
+C:\Users\Bruno\annex>git --git-dir=C:\\Users\\Bruno\\annex\\.git --work-tree=C:\\Users\\Bruno\\annex add -f test
+fatal: unable to access '../../../../C:\\Users\\Bruno\\annex\\.git/config': Invalid argument
+
+C:\Users\Bruno\annex>git --git-dir=C:/Users/Bruno/annex/.git --work-tree=C:\\Users\\Bruno\\annex add -f test
+
+C:\Users\Bruno\annex>\"\"\"]]
+
+It's weird that I don't have any problem with the following command:
+[[!format sh \"\"\"C:\Users\Bruno\annex>git --git-dir=C:\\Users\\Bruno\\annex\\.git --work-tree=C:\\Users\\Bruno\\annex config -l
+core.symlinks=false
+core.autocrlf=true
+[...]\"\"\"]]
+
+Maybe there's a problem with `git version 1.8.4.msysgit.0`.
+"""]]