mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

adjust: Fix behavior when used in a repository that contains submodules.

Browse source 
Also fixed the LsFiles parser to not assume its output has a fixed width
type field.
This commit is contained in:
Joey Hess 2017-02-20 13:44:55 -04:00
commit a13c0ce66c
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
5 changed files with 43 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
doc/bugs/Can__39__t_use_adjusted_branch_in_v6__44___if_submodule_already_is_using_this_feature.mdwn
View file

@ -54,3 +54,4 @@ operating system: linux x86_64
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
> [[fixed|done]] --[[Joey]]

20
doc/bugs/Can__39__t_use_adjusted_branch_in_v6__44___if_submodule_already_is_using_this_feature/comment_1_176faba802ecd62b04c06c6dab77f5f3._comment Normal file
View file

@ -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.
"""]]