Merge remote-tracking branch 'origin/master'

11 files changed, 60 insertions, 0 deletions

diff --git a/doc/bugs/OSX_case_insensitive_filesystem/comment_2_4472d5db7a1cf7242077184912e32e17._comment b/doc/bugs/OSX_case_insensitive_filesystem/comment_2_4472d5db7a1cf7242077184912e32e17._comment
new file mode 100644
index 000000000..4f841513e
--- /dev/null
+++ b/doc/bugs/OSX_case_insensitive_filesystem/comment_2_4472d5db7a1cf7242077184912e32e17._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://id.clacke.se/"
+ nickname="clacke"
+ subject="Case-sensitive on OSX"
+ date="2016-04-22T07:53:56Z"
+ content="""
+> What I'd recommend you do is, move the repository back to OSX, and then make a clone of it on the linux system
+
+Alternatively, create a case-sensitive FS on the Mac (just in a .dmg) and do the clone and copy to there, before rsync'ing to the remote Linux.
+"""]]
diff --git a/doc/bugs/OSX_case_insensitive_filesystem/comment_3_4be758c2b70c0aadfe4fc9ecff8e4522._comment b/doc/bugs/OSX_case_insensitive_filesystem/comment_3_4be758c2b70c0aadfe4fc9ecff8e4522._comment
new file mode 100644
index 000000000..dc6b89f91
--- /dev/null
+++ b/doc/bugs/OSX_case_insensitive_filesystem/comment_3_4be758c2b70c0aadfe4fc9ecff8e4522._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://id.clacke.se/"
+ nickname="clacke"
+ subject="objecthashlower"
+ date="2016-04-22T07:55:40Z"
+ content="""
+> It's actually possible to make brand-new git-annex repos use all lower case hash directories today, by setting git config annex.tune.objecthashlower true before you run git annex init for the first time.
+
+Am I interpreting this correctly, that this sets some attribute in the git-annex branch, so that clones of this repo will use the same annex layout?
+"""]]
diff --git a/doc/bugs/OSX_case_insensitive_filesystem/comment_4_0b0c95a902718dd4e0976bf4e2cf265b._comment b/doc/bugs/OSX_case_insensitive_filesystem/comment_4_0b0c95a902718dd4e0976bf4e2cf265b._comment
new file mode 100644
index 000000000..29a53e04f
--- /dev/null
+++ b/doc/bugs/OSX_case_insensitive_filesystem/comment_4_0b0c95a902718dd4e0976bf4e2cf265b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://id.clacke.se/"
+ nickname="clacke"
+ subject="objecthashlower"
+ date="2016-04-22T07:58:33Z"
+ content="""
+... i.e., can I just `git config --global annex.tune.objecthashlower true` and it will Just Work, managing old repos correctly and using the feature for new repos? And remote machines will handle things correctly just as long as they run a modern enough `git-annex`?
+"""]]
diff --git a/doc/bugs/startup_scan_extremely_slow___40__v6_repo__41__.mdwn b/doc/bugs/startup_scan_extremely_slow.mdwn
index 449c88e94..449c88e94 100644
--- a/doc/bugs/startup_scan_extremely_slow___40__v6_repo__41__.mdwn
+++ b/doc/bugs/startup_scan_extremely_slow.mdwn
diff --git a/doc/bugs/startup_scan_extremely_slow___40__v6_repo__41__/comment_1_68f88f04c179800c0ce1ff6925d4c6ab._comment b/doc/bugs/startup_scan_extremely_slow/comment_1_68f88f04c179800c0ce1ff6925d4c6ab._comment
index ea3347db7..ea3347db7 100644
--- a/doc/bugs/startup_scan_extremely_slow___40__v6_repo__41__/comment_1_68f88f04c179800c0ce1ff6925d4c6ab._comment
+++ b/doc/bugs/startup_scan_extremely_slow/comment_1_68f88f04c179800c0ce1ff6925d4c6ab._comment
diff --git a/doc/bugs/startup_scan_extremely_slow___40__v6_repo__41__/comment_2_116e850299372027481c9d0a1667d5af._comment b/doc/bugs/startup_scan_extremely_slow/comment_2_116e850299372027481c9d0a1667d5af._comment
index 03683dea1..03683dea1 100644
--- a/doc/bugs/startup_scan_extremely_slow___40__v6_repo__41__/comment_2_116e850299372027481c9d0a1667d5af._comment
+++ b/doc/bugs/startup_scan_extremely_slow/comment_2_116e850299372027481c9d0a1667d5af._comment
diff --git a/doc/bugs/startup_scan_extremely_slow___40__v6_repo__41__/comment_3_3eb4c2290e560451e7341b85b58212b0._comment b/doc/bugs/startup_scan_extremely_slow/comment_3_3eb4c2290e560451e7341b85b58212b0._comment
index a2ac70fae..a2ac70fae 100644
--- a/doc/bugs/startup_scan_extremely_slow___40__v6_repo__41__/comment_3_3eb4c2290e560451e7341b85b58212b0._comment
+++ b/doc/bugs/startup_scan_extremely_slow/comment_3_3eb4c2290e560451e7341b85b58212b0._comment
diff --git a/doc/bugs/startup_scan_extremely_slow/comment_4_ade878000a050c87a345e8bc9914deba._comment b/doc/bugs/startup_scan_extremely_slow/comment_4_ade878000a050c87a345e8bc9914deba._comment
new file mode 100644
index 000000000..76cf8faed
--- /dev/null
+++ b/doc/bugs/startup_scan_extremely_slow/comment_4_ade878000a050c87a345e8bc9914deba._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="zarel"
+ subject="comment 4"
+ date="2016-04-22T15:27:20Z"
+ content="""
+git-annex updated to the last version. .git removed, repo recreated from scratch in v5 direct mode and it still happens. I'll try to export GIT_TRACE and understand why the \"cat-file\" is taking 50% of a cpu
+"""]]
diff --git a/doc/forum/n00b_question._Can_I_use_git-annex_to_manage_a_tree_that_contains_git_repos__63__.mdwn b/doc/forum/n00b_question._Can_I_use_git-annex_to_manage_a_tree_that_contains_git_repos__63__.mdwn
new file mode 100644
index 000000000..46257f646
--- /dev/null
+++ b/doc/forum/n00b_question._Can_I_use_git-annex_to_manage_a_tree_that_contains_git_repos__63__.mdwn
@@ -0,0 +1,7 @@
+Just started looking at git-annex and it's very interesting to me as I manage a large tree of different types of projects, spread across two computers and some hard-drives (some backups, some offline resources and archives)
+
+But one question that's bothering me. A lot of my projects are already git repos. Is it possible to use git-annex with this tree or will the gits fight unless I explicitly make them submodules? 
+
+cheers
+
+Phil
diff --git a/doc/forum/n00b_question._Can_I_use_git-annex_to_manage_a_tree_that_contains_git_repos__63__/comment_1_ac45ad341f026289ce56183b9ff463af._comment b/doc/forum/n00b_question._Can_I_use_git-annex_to_manage_a_tree_that_contains_git_repos__63__/comment_1_ac45ad341f026289ce56183b9ff463af._comment
new file mode 100644
index 000000000..8e409bb5e
--- /dev/null
+++ b/doc/forum/n00b_question._Can_I_use_git-annex_to_manage_a_tree_that_contains_git_repos__63__/comment_1_ac45ad341f026289ce56183b9ff463af._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://id.clacke.se/"
+ nickname="clacke"
+ subject="git-annex is git"
+ date="2016-04-22T07:44:06Z"
+ content="""
+git-annex is first git, then some additional very neat functionality. Being git, it refuses to handle git repositories as that would create all kinds of potential confusion and inefficiency.
+
+Submodules would be a way to go, if you like how they work. Or you could just ignore the git repos, as you probably have them replicated somewhere else.
+"""]]
diff --git a/doc/forum/n00b_question._Can_I_use_git-annex_to_manage_a_tree_that_contains_git_repos__63__/comment_2_53e0ffe901a1a1c22361bfd7cf71affd._comment b/doc/forum/n00b_question._Can_I_use_git-annex_to_manage_a_tree_that_contains_git_repos__63__/comment_2_53e0ffe901a1a1c22361bfd7cf71affd._comment
new file mode 100644
index 000000000..73a2e8ce0
--- /dev/null
+++ b/doc/forum/n00b_question._Can_I_use_git-annex_to_manage_a_tree_that_contains_git_repos__63__/comment_2_53e0ffe901a1a1c22361bfd7cf71affd._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="interstar@551341a1dbca18391e90a3f719eae492868ceb7a"
+ nickname="interstar"
+ subject="comment 2"
+ date="2016-04-22T12:38:16Z"
+ content="""
+OK. Thanks.
+"""]]