Only recurse into submodules if .submodules exists
#125
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mgedmin
approved these changes
Oct 2, 2020
There was a problem hiding this comment.
Looks good to me! I also don't have a way of testing this (well TBH, I'm just too lazy to hunt down docker images with RHEL7).
All it needs before it can be merged is a changelog entry, and also I want to wait for Travis results to see if test coverage remains at 100%. (It should, because you cunningly used the ternary operator, and I'm not measuring branch coverage :)
|
The PR looks good on travis: https://travis-ci.org/github/mgedmin/check-manifest/builds/731900926. Travis dot ORG -> GitHub status updates probably ran into API rate limits again. |
`git` before version 2.11 does not know the `--recurse-submodules` flag. Some OSes (RHEL 7, Debian Jessie, Ubuntu 16.04 LTS) still ship with versions older than that. With this change, `git` is only passed `--recurse-submodules` if the repo in question has submodules configured, as indicated by the presence of `.gitmodules`. This prevents bugs like #123 on newer platforms, while still supporting older platforms, as long as repos there do not have submodules configured. This fixes #124.
|
Travs is green, I'm just gonna merge this and try to come up with a changelog note myself then. Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
gitbefore version 2.11 does not know the--recurse-submodulesflag. Some OSes (RHEL 7, Debian Jessie, Ubuntu 16.04 LTS) still ship with versions older than that.With this change,
gitis only passed--recurse-submodulesif the repo in question has submodules configured, as indicated by the presence of.gitmodules. This prevents bugs like #123 on newer platforms, while still supporting older platforms, as long as repos there do not have submodules configured.This fixes #124.
Does this look like it would be enough to make
check-manifestwork on older platforms? I cant really test it right now.