diff options
Diffstat (limited to 'doc/bugs/direct_cripple_mode_crippled_my_other_non-crippled_repos')
4 files changed, 0 insertions, 73 deletions
diff --git a/doc/bugs/direct_cripple_mode_crippled_my_other_non-crippled_repos/comment_1_8b2f7e960cf0ed043c5ad070d6fc08e2._comment b/doc/bugs/direct_cripple_mode_crippled_my_other_non-crippled_repos/comment_1_8b2f7e960cf0ed043c5ad070d6fc08e2._comment deleted file mode 100644 index a3eace0d5..000000000 --- a/doc/bugs/direct_cripple_mode_crippled_my_other_non-crippled_repos/comment_1_8b2f7e960cf0ed043c5ad070d6fc08e2._comment +++ /dev/null @@ -1,38 +0,0 @@ -[[!comment format=mdwn - username="joey" - subject="""analysis""" - date="2015-10-15T17:30:12Z" - content=""" -git merge fails because it cannot write to these filenames. - -git-annex assumes that, if git merge failed, there was a merge conflict, so -the automatic merge conflict resolution code is run. There are probably no -unmerged files in this case. So, the automatic merge conflict resolution -finds nothing to do, probably. - -However, since the automatic merge conflict resolution code ran, it now -assumes the merge has been dealt with, and proceeds to clean up, including -making a merge commit. - -The merge commit is where the file "removal" happens. It should bail out -before that point. - -The best fix would be to detect that git merge has crashed early and skip -all the merge conflict resolution etc. How? git merge uses the same -exit status for this kind of crash as it does for an unresolved merge -conflict. - -It could notice that there are no merge conflicts to be found, and so know -the merge failed for some other reason. However, what if there are both -merge conflicts and illegal filenames? Testing that situation, git merge -seems to always crash on creating the illegal files, before it updates -git state to reflect any merge conflicts. So, this approach seems to work. - -(It could also look for .git/MERGE_HEAD, which is written after a -conflicted merge.) - ----- - -Note that mentions of repo size etc later in this bug report don't seem to -be related to this problem. -"""]] diff --git a/doc/bugs/direct_cripple_mode_crippled_my_other_non-crippled_repos/comment_2_c29094478fc0f1b9e5475f27bd681ec8._comment b/doc/bugs/direct_cripple_mode_crippled_my_other_non-crippled_repos/comment_2_c29094478fc0f1b9e5475f27bd681ec8._comment deleted file mode 100644 index e8ad87b38..000000000 --- a/doc/bugs/direct_cripple_mode_crippled_my_other_non-crippled_repos/comment_2_c29094478fc0f1b9e5475f27bd681ec8._comment +++ /dev/null @@ -1,11 +0,0 @@ -[[!comment format=mdwn - username="anarcat" - subject="amazing" - date="2015-10-17T02:17:13Z" - content=""" -thanks so much for the fast response time! :) and yes, the comments about the file size are unrelated ranting on my part, sorry about that. :) - -i wonder if [[bugs/direct_command_leaves_repository_inconsistent_if_interrupted/]] may not be related to this / fixed by the change... - -thanks again, great job. :) -"""]] diff --git a/doc/bugs/direct_cripple_mode_crippled_my_other_non-crippled_repos/comment_3_b2a029fc9f4765633ef5393fe091016e._comment b/doc/bugs/direct_cripple_mode_crippled_my_other_non-crippled_repos/comment_3_b2a029fc9f4765633ef5393fe091016e._comment deleted file mode 100644 index 36555e30d..000000000 --- a/doc/bugs/direct_cripple_mode_crippled_my_other_non-crippled_repos/comment_3_b2a029fc9f4765633ef5393fe091016e._comment +++ /dev/null @@ -1,13 +0,0 @@ -[[!comment format=mdwn - username="Kalle" - subject="Had what I believe to be the same issue" - date="2016-03-31T21:22:21Z" - content=""" -[[Podcast_filename_encoding_breaks_Android_client/]] - -The problem for me was that the podcatcher setup would automatically download new dangerous files and wipe all repos... My workaround in the end was to use ``--template`` to create date only filenames for podcasts. A solution I still use but it's rather inconvenient as more descriptive filenames are useful. - -This is quite a dangerous bug as all you need is a direct mode repo and an unusual filename for your whole annex cluster to empty itself. It can be saved by git surgery but unless being very careful you just end up syncing the bad filename back from a repo or another. - - -"""]] diff --git a/doc/bugs/direct_cripple_mode_crippled_my_other_non-crippled_repos/comment_4_587db5d4a9007a60a63f8fdf5cf01208._comment b/doc/bugs/direct_cripple_mode_crippled_my_other_non-crippled_repos/comment_4_587db5d4a9007a60a63f8fdf5cf01208._comment deleted file mode 100644 index cf25fe1cd..000000000 --- a/doc/bugs/direct_cripple_mode_crippled_my_other_non-crippled_repos/comment_4_587db5d4a9007a60a63f8fdf5cf01208._comment +++ /dev/null @@ -1,11 +0,0 @@ -[[!comment format=mdwn - username="joey" - subject="""comment 4""" - date="2016-04-04T18:55:50Z" - content=""" -@Kalle but this bug was fixed in October 2015 as far as we know. - -If you experienced the bug with a version of git-annex newer than -5.20151019, then this bug ought to be re-opened. But I'm pretty sure I -reproduced the bug back then, fixed it, and tested the fix. -"""]] |