Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upsubmodule.update with init=True does not work if the submodule does not have a 'master' branch #1058
Labels
Comments
|
Thanks for taking the time for this fantastic issue description! Unfortunately, nothing I could write here would do it any justice because I wouldn't know how to fix that. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
We have encountered an issue with
submodule.updatethat reproduces in a rather special circumstance:Setup
Have a git repo, say
test, containing one submodule, saytest_submodule.test_submodulemust have nomasterbranch (let say the default branch is calleddevelopinstead).Check out a revision of
testthat points to the tip ofdevelopfortest_submodule, but do notgit submodule initthe submodule. The directory hierarchy should look like this:Now, create a
Repofortest, and callrepo.submodules[0].update(init=True)Expected results
The tip of
developis checked out intest_submoduleand the index is clean.Actual results
test_submoduleis pointing at the tip of develop, but all of the files are staged for deletion. Additionally, there is a warning printed:Failed to checkout tracking branch refs/heads/masterMy analysis of why this happens
Before any bad behavior happens,
submodule.updateclones the submodule repository with-n, which means the clone does not actually check out the commit the clone ends up with. Remember this for later.After cloning, we begin the process of updating the submodule to match what the parent repo specifies.
submodule.updatetakes an optionalbranchargument, which defaults toNone. WhenbranchisNone, we assume the branch ismaster. Here, we try to find this branch and point HEAD to it, but of course in the repro case this fails because the branch does not exist. This is crucial, because this means we skip the line that marks the repo as "not checked out" by pointing the branch to the "NULL" sha.Now, recall that a requirement of the repro is that
testpoints to the tip ofdevelopfortest_submodule. Since we did not move the repo to the NULL sha beforehand, the repo is already at the desired sha when we arrive at this conditional. Therefore, the condition evaluates to false, and we skip all the code that actually checks out code.Finally, recall our
-ncheckout from the first paragraph. Since we did not check out any code after cloning, the repo is left in an un-checked-out state, which is exactly the "Actual results" state described above.Closing thoughts
We can workaround this issue simply by adding a dummy
masterbranch totest_submodule, but this should not be required. Ideally,submodule.updatedoes not require a valid branch to operate correctly, sincegit submodule update --initworks just fine without one.