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

4 files changed, 54 insertions, 0 deletions

diff --git a/doc/design/external_special_remote_protocol/comment_6_ee2828ce25b83bbabc9d5dde35d1e57b._comment b/doc/design/external_special_remote_protocol/comment_6_ee2828ce25b83bbabc9d5dde35d1e57b._comment
new file mode 100644
index 000000000..f57bfabbc
--- /dev/null
+++ b/doc/design/external_special_remote_protocol/comment_6_ee2828ce25b83bbabc9d5dde35d1e57b._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.227"
+ subject="comment 6"
+ date="2013-12-31T17:56:34Z"
+ content="""
+I suppose you're talking about preferred content settings.
+
+I think that it makes sense for hooks to use existing git-annex plumbing etc when it's available. So a hook could just run `git annex wanted` to manage its preferred content.
+
+The only problem is that a hook does not currently have a way to discover the UUID of the repository! So I've added a GETUUID to cover this and other use cases.
+"""]]
diff --git a/doc/design/external_special_remote_protocol/comment_7_edb649d0019a061ef7bf6534a444429d._comment b/doc/design/external_special_remote_protocol/comment_7_edb649d0019a061ef7bf6534a444429d._comment
new file mode 100644
index 000000000..4e9f91c42
--- /dev/null
+++ b/doc/design/external_special_remote_protocol/comment_7_edb649d0019a061ef7bf6534a444429d._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8"
+ nickname="TobiasTheViking"
+ subject="comment 7"
+ date="2013-12-31T18:20:32Z"
+ content="""
+I think the hook running anything in shell, to interact with git annex, is a mistake.
+
+I see a lot more potential pitfalls and mistakes(especially crossplatform). 
+
+It should be the existing git annex plumbing (preferred content) as you say. I just really think it should be configurable in the protocol, instead of a having to run a shell command. 
+
+Since you have made this advanced protocol i really see it as a mistake to do anything between the hook and git-annex outside of the protocol, it makes much more sense to have all their interactions happen within the protocol.
+
+IMO anyways.
+"""]]
diff --git a/doc/forum/Git_Annex_Sync_Delinks_Files/comment_1_8b03707777a9d8e38715cb77d2a0addc._comment b/doc/forum/Git_Annex_Sync_Delinks_Files/comment_1_8b03707777a9d8e38715cb77d2a0addc._comment
new file mode 100644
index 000000000..ad0605f49
--- /dev/null
+++ b/doc/forum/Git_Annex_Sync_Delinks_Files/comment_1_8b03707777a9d8e38715cb77d2a0addc._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.227"
+ subject="comment 1"
+ date="2013-12-31T18:06:15Z"
+ content="""
+Are you using direct mode?
+
+Before the direct mode guard was put in place, it was not uncommon for users to mistakenly run some command like \"git commit -a\" in a direct mode repository. This happily checks the full large files into git.
+
+It sounds to me like you've done that. But, you have not provided enough information to make anything more than a vague guess.
+"""]]
diff --git a/doc/forum/crashing_committers_on_files_with_special_characters_in_their_names/comment_1_548cf13c217a46dcc09d1ae5b62f33fd._comment b/doc/forum/crashing_committers_on_files_with_special_characters_in_their_names/comment_1_548cf13c217a46dcc09d1ae5b62f33fd._comment
new file mode 100644
index 000000000..382c7de5e
--- /dev/null
+++ b/doc/forum/crashing_committers_on_files_with_special_characters_in_their_names/comment_1_548cf13c217a46dcc09d1ae5b62f33fd._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ ip="209.250.56.227"
+ subject="comment 1"
+ date="2013-12-31T18:03:34Z"
+ content="""
+You forgot to include
+
+* A version number
+* An error message
+* A way to reproduce the problem.
+
+Without this information, I cannot help you, except to say that git-annex is very careful not to care at all about the contents or encoding of filenames and has been used with a wide variety of filenames, including all characters you listed, without any known problems.
+"""]]