This repository was archived by the owner on May 12, 2018. It is now read-only.
Commit 1f476c9
committed
Merge branch 'fix-submodule-parsing' into 'master'
Fix submodule parsing (again)
Fixes gitlab-org/gitlab-ce#714. This addresses another bug in the `Repository#submodules` method, where the `.gitmodules` file is not parsed correctly if it contains unusual whitespace formatting. I did not add any new tests for this change, but I did submit a merge request to the test repo at gitlab-org/gitlab-git-test!2 to introduce unusual whitespace in the test repo's `.gitmodules` file. I have updated tests ready to go to handle the breakage inherent with a new commit in the test repo, I just need to plug in the SHAs of the merge commit and the new tag (if you create one). When the test repo changes are merged, I'll open a new MR to update gitlab_git's tests.
/cc @jacobvosmaer @dzaporozhets
See merge request !111 file changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
736 | 736 | | |
737 | 737 | | |
738 | 738 | | |
739 | | - | |
| 739 | + | |
740 | 740 | | |
741 | 741 | | |
742 | 742 | | |
743 | | - | |
| 743 | + | |
744 | 744 | | |
745 | 745 | | |
746 | 746 | | |
| |||
0 commit comments