aboutsummaryrefslogtreecommitdiff
path: root/doc/bugs/Can__39__t_use_adjusted_branch_in_v6__44___if_submodule_already_is_using_this.../comment_1_176faba802ecd62b04c06c6dab77f5f3._comment
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-20 13:44:55 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-20 13:44:55 -0400
commit327f40427ba82efe8b624e4a753a346419036300 (patch)
tree5e59f919c758e49304618b54d89980d4d427e8d6 /doc/bugs/Can__39__t_use_adjusted_branch_in_v6__44___if_submodule_already_is_using_this_feature/comment_1_176faba802ecd62b04c06c6dab77f5f3._comment
parenta760ccd25ce255cd092020ad85dd231ebe691991 (diff)
adjust: Fix behavior when used in a repository that contains submodules.
Also fixed the LsFiles parser to not assume its output has a fixed width type field.
Diffstat (limited to 'doc/bugs/Can__39__t_use_adjusted_branch_in_v6__44___if_submodule_already_is_using_this_feature/comment_1_176faba802ecd62b04c06c6dab77f5f3._comment')
-rw-r--r--doc/bugs/Can__39__t_use_adjusted_branch_in_v6__44___if_submodule_already_is_using_this_feature/comment_1_176faba802ecd62b04c06c6dab77f5f3._comment20
1 files changed, 20 insertions, 0 deletions
diff --git a/doc/bugs/Can__39__t_use_adjusted_branch_in_v6__44___if_submodule_already_is_using_this_feature/comment_1_176faba802ecd62b04c06c6dab77f5f3._comment b/doc/bugs/Can__39__t_use_adjusted_branch_in_v6__44___if_submodule_already_is_using_this_feature/comment_1_176faba802ecd62b04c06c6dab77f5f3._comment
new file mode 100644
index 000000000..76e0c7814
--- /dev/null
+++ b/doc/bugs/Can__39__t_use_adjusted_branch_in_v6__44___if_submodule_already_is_using_this_feature/comment_1_176faba802ecd62b04c06c6dab77f5f3._comment
@@ -0,0 +1,20 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2017-02-20T17:13:54Z"
+ content="""
+Error message is:
+
+ git-annex: unexpected object type "comm"
+
+What it's actually choking on is the "commit" object for the submodule,
+in git-ls-tree output. Doesn't matter if the submodule uses
+adjusted branches or not.
+
+The parser for ls-tree output is buggy;
+it's expecting only "blob" and "tree", so pulls out a fixed width 4
+characters: "comm"
+
+Also, the adjusted branch code needs to be made to skip over CommitObjects,
+once the parser is fixed to generate them.
+"""]]