diff options
author | Joey Hess <joey@kitenet.net> | 2014-10-12 13:18:37 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-10-12 13:18:37 -0400 |
commit | e9427fac4656f92429177903242b143697c5e4fa (patch) | |
tree | 4576e2cfecccdaba14a5807671a1f28d11a6cbb3 | |
parent | 1b474f3cb9cdf14817efa0aa36062c89fda0e59b (diff) | |
parent | da4845e9a382895e32fea07fdbf3a901fa30df34 (diff) |
Merge branch 'master' of ssh://git-annex.branchable.com
7 files changed, 56 insertions, 0 deletions
diff --git a/doc/forum/Git_annex_hangs.mdwn b/doc/forum/Git_annex_hangs.mdwn new file mode 100644 index 000000000..a7bb35905 --- /dev/null +++ b/doc/forum/Git_annex_hangs.mdwn @@ -0,0 +1,2 @@ +http://stackoverflow.com/questions/26305691/git-annex-hangs +Does anyone know what might be causing this? diff --git a/doc/forum/Git_annex_hangs/comment_1_e6b854d4625ae3015aea9c5de71a28ef._comment b/doc/forum/Git_annex_hangs/comment_1_e6b854d4625ae3015aea9c5de71a28ef._comment new file mode 100644 index 000000000..34df8fb97 --- /dev/null +++ b/doc/forum/Git_annex_hangs/comment_1_e6b854d4625ae3015aea9c5de71a28ef._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.54" + subject="comment 1" + date="2014-10-10T18:51:57Z" + content=""" +I have followed up there, but the basic answer is, pass --debug to see what it's doing. +"""]] diff --git a/doc/forum/Git_annex_hangs/comment_2_4f848771e60c38321a97361b0d1b33dd._comment b/doc/forum/Git_annex_hangs/comment_2_4f848771e60c38321a97361b0d1b33dd._comment new file mode 100644 index 000000000..cc1b23c08 --- /dev/null +++ b/doc/forum/Git_annex_hangs/comment_2_4f848771e60c38321a97361b0d1b33dd._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawktbkKjilg70XC9XBFpIgVhtfLYH-0UMHY" + nickname="Tad" + subject="comment 2" + date="2014-10-10T19:08:49Z" + content=""" +--debug is useful. Thanks! I have tried from scratch and added backend after creating file and that worked. I will use --debug in the future +"""]] diff --git a/doc/forum/git-annex_vicfg_preferred_content_settings_are_not_being_saved.mdwn b/doc/forum/git-annex_vicfg_preferred_content_settings_are_not_being_saved.mdwn new file mode 100644 index 000000000..a4386add7 --- /dev/null +++ b/doc/forum/git-annex_vicfg_preferred_content_settings_are_not_being_saved.mdwn @@ -0,0 +1 @@ +The settings don't seem to be saving. If I edit it, then immediately open the file again, the settings are what they were before. This happens no matter what repo I do it from. diff --git a/doc/forum/git_annex_whereis_--json_output_with_two_variables_with_same_name/comment_2_d08a955a11953cc783f09bfba180dbd6._comment b/doc/forum/git_annex_whereis_--json_output_with_two_variables_with_same_name/comment_2_d08a955a11953cc783f09bfba180dbd6._comment new file mode 100644 index 000000000..02bd6de1f --- /dev/null +++ b/doc/forum/git_annex_whereis_--json_output_with_two_variables_with_same_name/comment_2_d08a955a11953cc783f09bfba180dbd6._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkR2dZjxqujBXcitvsP_PeWG8A-LfLU_tg" + nickname="Fernão" + subject="comment 2" + date="2014-10-10T18:18:04Z" + content=""" +nice, it worked =) +"""]] diff --git a/doc/forum/multiple_git_repositories_inside_git_annex_assistant_repository.mdwn b/doc/forum/multiple_git_repositories_inside_git_annex_assistant_repository.mdwn new file mode 100644 index 000000000..b9500fa10 --- /dev/null +++ b/doc/forum/multiple_git_repositories_inside_git_annex_assistant_repository.mdwn @@ -0,0 +1,19 @@ +I have a Desktop computer at home and another at work, and work from home every other day. I'd like to use git-annex assistant to keep my git checkouts in sync across both of them. I may be a bit unusual in that I don't always commit before going home. + +I also would like to have anything in the git stash synchronized between the two, the .git/config file, etc. + +So to be clear, I have a file structure like the following: + + ./annex/.git + ./annex/project/README.md + ./annex/project/.git + ./annex/project2/README.md + ./annex/project2/.git + +In my testing it seems that the "project/.git" folders aren't synchronized between my two desktops, even though the rest of the files are. A workaround is to rename "project/.git" to something else, like "project/.gitfoo", and then use --git-dir when issuing my git commands. + +Is this something that can be worked around? I apologize if this is covered elsewhere, as I wasn't thinking of the right terms to search for. + +I've looked through the code and can't find anything obvious. I imagine this is because git hard-codes all ".git" subdirectories as something it should ignore. + +Is there a better workaround? I realize this is probably a niche use case. diff --git a/doc/forum/multiple_git_repositories_inside_git_annex_assistant_repository/comment_1_419b27cb1c71bce021ef9f2e471aa92e._comment b/doc/forum/multiple_git_repositories_inside_git_annex_assistant_repository/comment_1_419b27cb1c71bce021ef9f2e471aa92e._comment new file mode 100644 index 000000000..8d698b1ba --- /dev/null +++ b/doc/forum/multiple_git_repositories_inside_git_annex_assistant_repository/comment_1_419b27cb1c71bce021ef9f2e471aa92e._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="jewel" + ip="23.30.55.105" + subject="comment 1" + date="2014-10-12T05:22:03Z" + content=""" +Now I've found the relevant bug: `http://git-annex.branchable.com/bugs/Can__39__t_add_a_git_repo_to_git_annex:___34__Invalid_path_repo__47__.git__47__X__34___for_many_X`. + +Note the symlink workaround near the end. A quick test shows that it's working great. I'll try it out for a few months and report back. +"""]] |